diff --git a/projects/vdk-core/.gitlab-ci.yml b/projects/vdk-core/.gitlab-ci.yml index bce38f3fa8..6c069e8d96 100644 --- a/projects/vdk-core/.gitlab-ci.yml +++ b/projects/vdk-core/.gitlab-ci.yml @@ -3,7 +3,7 @@ include: - "projects/vdk-core/plugins/.plugin-common.yml" - - "projects/vdk-core/plugins/*/.plugin-ci.yml" +# - "projects/vdk-core/plugins/*/.plugin-ci.yml" image: "python:3.9" diff --git a/projects/vdk-core/CONTRIBUTING.md b/projects/vdk-core/CONTRIBUTING.md index 14bbf7b020..94821ea5ae 100644 --- a/projects/vdk-core/CONTRIBUTING.md +++ b/projects/vdk-core/CONTRIBUTING.md @@ -21,7 +21,7 @@ Setting up the development environment can be done in the following way: ## Implementing plugins * You can find a template for implementing plugins in `/plugins/plugin-template`; -* Include your implementation files inside the `/src/taurus/vdk/` directory, and any tests inside the `/tests/` directory; +* Include your implementation files inside the `/src/vdk/internal/` directory, and any tests inside the `/tests/` directory; * Include your dependencies inside the `requirements.txt` file; * Change the name of the plugin package, the plugin itself and the name of the Python file containing the plugin hooks inside the `setup.py` file; * Change the name of the build and release jobs and the name variable inside the `.plugin-ci.yml` file to match the name of your plugin; diff --git a/projects/vdk-core/README_PLUGINS.md b/projects/vdk-core/README_PLUGINS.md index 53a74d8e5a..8f3e5828e5 100644 --- a/projects/vdk-core/README_PLUGINS.md +++ b/projects/vdk-core/README_PLUGINS.md @@ -24,20 +24,20 @@ Once the plugin is installed, vdk automatically finds it and activates it. A plugin is a python module that enhances or changes the behavior of Versatile Data Kit.
A plugin is simply an implementation of one or more plugin hooks. -See all supported hook function specifications in [specs.py](src/taurus/api/plugin/core_hook_spec.py). +See all supported hook function specifications in [specs.py](src/vdk/api/plugin/core_hook_spec.py). The spec documentation contains details and examples for how a hook can be used. To create a new plugin, there are only two steps necessary:
* Create your implementation of the plugin's hook(s): You will need to mark it with the `hookimpl` decorator. - Check out its [documentation here](src/taurus/api/plugin/hook_markers.py) to see how you can configure the hook execution order + Check out its [documentation here](src/vdk/api/plugin/hook_markers.py) to see how you can configure the hook execution order ```python # this is module myproject.pluginmodule, which will be our plugin # define hookimpl as follows # you need to have vdk-core as dependency -from taurus.api.plugin.hook_markers import hookimpl +from vdk.api.plugin.hook_markers import hookimpl # name of function must match name of hookspec function @@ -78,7 +78,7 @@ entry_points={ 'vdk.plugin.run': ['name_of_plugin = myproject.pluginmodule'] } Versatile Data Kit is used for executing different commands, some of them provided as plugins. Using the above hooks, one can extend the functionality of any command by adding monitoring, customizing logging, or adding new options. -Check out the [CoreHookSpec class](src/taurus/api/plugin/core_hook_spec.py) documentation for more details. +Check out the [CoreHookSpec class](src/vdk/api/plugin/core_hook_spec.py) documentation for more details. ### Data Job Run (Execution) Cycle @@ -86,4 +86,4 @@ Check out the [CoreHookSpec class](src/taurus/api/plugin/core_hook_spec.py) docu The above image shows the normal run cycle of a data job. The hooks shown are only invoked when the "vdk run" command is invoked to execute a data job. -Check out the [JobRunSpecs class](src/taurus/api/plugin/core_hook_spec.py) documentation for more details. +Check out the [JobRunSpecs class](src/vdk/api/plugin/core_hook_spec.py) documentation for more details. diff --git a/projects/vdk-core/cicd/release-vdk-core.sh b/projects/vdk-core/cicd/release-vdk-core.sh index b40f2d293e..67bb01d30f 100755 --- a/projects/vdk-core/cicd/release-vdk-core.sh +++ b/projects/vdk-core/cicd/release-vdk-core.sh @@ -8,7 +8,7 @@ cd .. echo "$(cat version.txt | grep -o '[0-9]\.[0-9]').$CI_PIPELINE_ID" > version.txt -build_info_file="src/taurus/vdk/vdk_build_info.py" +build_info_file="src/vdk/internal/vdk_build_info.py" echo "" > $build_info_file # clear build info file first echo "RELEASE_VERSION='$(cat version.txt | grep -o '[0-9]\.[0-9]').$CI_PIPELINE_ID'" >> $build_info_file diff --git a/projects/vdk-core/cicd/simple-functional-test.sh b/projects/vdk-core/cicd/simple-functional-test.sh index 968aa49cf2..0578f45dc3 100755 --- a/projects/vdk-core/cicd/simple-functional-test.sh +++ b/projects/vdk-core/cicd/simple-functional-test.sh @@ -52,8 +52,8 @@ python setup.py sdist --formats=gztar && pip install dist/* || fail "VDK Install function restore_vdk_in_editable_mode { pip install -e . - pip install -e --extra-index-url $PIP_EXTRA_INDEX_URL ./plugins/vdk-trino - pip install -e --extra-index-url $PIP_EXTRA_INDEX_URL ./plugins/vdk-plugin-control-cli + pip install --extra-index-url $PIP_EXTRA_INDEX_URL -e ./plugins/vdk-trino + # pip install --extra-index-url $PIP_EXTRA_INDEX_URL -e ./plugins/vdk-plugin-control-cli - disabled temporarily } trap restore_vdk_in_editable_mode EXIT @@ -63,16 +63,16 @@ rm -rf dist/* python setup.py sdist --formats=gztar && pip install dist/* || fail "vdk-trino plugin Install failed" popd || exit -echo "Install vdk-control-cli plugin" -pushd plugins/vdk-plugin-control-cli || exit -rm -rf dist/* -python setup.py sdist --formats=gztar && pip install --extra-index-url $PIP_EXTRA_INDEX_URL dist/* || fail "vdk-control-cli plugin Install failed" -popd || exit +#echo "Install vdk-control-cli plugin" +#pushd plugins/vdk-plugin-control-cli || exit +#rm -rf dist/* +#python setup.py sdist --formats=gztar && pip install --extra-index-url $PIP_EXTRA_INDEX_URL dist/* || fail "vdk-control-cli plugin Install failed" +#popd || exit echo "Run commands ..." vdk || fail "vdk command failed" vdk hello || fail "vdk hello command failed" -vdk deploy --help || fail "vdk-control-cli deploy --help command failed" +# vdk deploy --help || fail "vdk-control-cli deploy --help command failed" vdk version || fail "vdk version failed" diff --git a/projects/vdk-core/plugins/example-command-defaults-hook/defaults_hook.py b/projects/vdk-core/plugins/example-command-defaults-hook/defaults_hook.py index f5a30fe0e4..ee662f6537 100644 --- a/projects/vdk-core/plugins/example-command-defaults-hook/defaults_hook.py +++ b/projects/vdk-core/plugins/example-command-defaults-hook/defaults_hook.py @@ -1,9 +1,9 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 import click -from taurus.api.plugin.hook_markers import hookimpl -from taurus.api.plugin.plugin_utils import set_defaults_for_all_commands -from taurus.api.plugin.plugin_utils import set_defaults_for_specific_command +from vdk.api.plugin.hook_markers import hookimpl +from vdk.api.plugin.plugin_utils import set_defaults_for_all_commands +from vdk.api.plugin.plugin_utils import set_defaults_for_specific_command @hookimpl diff --git a/projects/vdk-core/plugins/plugin-template/setup.py b/projects/vdk-core/plugins/plugin-template/setup.py index dc7e36c0fd..282ff098ea 100644 --- a/projects/vdk-core/plugins/plugin-template/setup.py +++ b/projects/vdk-core/plugins/plugin-template/setup.py @@ -26,7 +26,7 @@ install_requires=["vdk-core"], package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), - entry_points={"vdk.plugin.run": ["plugin-template = taurus.vdk.plugin_template"]}, + entry_points={"vdk.plugin.run": ["plugin-template = vdk.internal.plugin_template"]}, classifiers=[ "Development Status :: 4 - Beta", "License :: OSI Approved :: Apache Software License", diff --git a/projects/vdk-core/plugins/plugin-template/src/taurus/vdk/plugin_template.py b/projects/vdk-core/plugins/plugin-template/src/vdk/internal/plugin_template.py similarity index 64% rename from projects/vdk-core/plugins/plugin-template/src/taurus/vdk/plugin_template.py rename to projects/vdk-core/plugins/plugin-template/src/vdk/internal/plugin_template.py index 18665ff9fa..221ba2fe25 100644 --- a/projects/vdk-core/plugins/plugin-template/src/taurus/vdk/plugin_template.py +++ b/projects/vdk-core/plugins/plugin-template/src/vdk/internal/plugin_template.py @@ -1,11 +1,11 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.plugin.hook_markers import hookimpl +from vdk.api.plugin.hook_markers import hookimpl """ Include the plugin hooks here. For example: -from taurus.vdk.core.context import CoreContext +from vdk.internal.core.context import CoreContext @hookimpl def vdk_initialize(context: CoreContext): diff --git a/projects/vdk-core/plugins/vdk-csv/setup.py b/projects/vdk-core/plugins/vdk-csv/setup.py index 739cad9fd6..b5f6804f4a 100644 --- a/projects/vdk-core/plugins/vdk-csv/setup.py +++ b/projects/vdk-core/plugins/vdk-csv/setup.py @@ -16,7 +16,7 @@ install_requires=["vdk-core", "pandas"], package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), - entry_points={"vdk.plugin.run": ["vdk-csv = taurus.vdk.csv_plugin"]}, + entry_points={"vdk.plugin.run": ["vdk-csv = vdk.internal.csv_plugin"]}, classifiers=[ "Development Status :: 4 - Beta", "License :: OSI Approved :: Apache Software License", diff --git a/projects/vdk-core/plugins/vdk-csv/src/taurus/vdk/csv_ingest_job/csv_ingest_step.py b/projects/vdk-core/plugins/vdk-csv/src/vdk/internal/csv_ingest_job/csv_ingest_step.py similarity index 96% rename from projects/vdk-core/plugins/vdk-csv/src/taurus/vdk/csv_ingest_job/csv_ingest_step.py rename to projects/vdk-core/plugins/vdk-csv/src/vdk/internal/csv_ingest_job/csv_ingest_step.py index 8f60f02185..2e34c0c05c 100644 --- a/projects/vdk-core/plugins/vdk-csv/src/taurus/vdk/csv_ingest_job/csv_ingest_step.py +++ b/projects/vdk-core/plugins/vdk-csv/src/vdk/internal/csv_ingest_job/csv_ingest_step.py @@ -5,7 +5,7 @@ import pathlib from typing import Dict -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-csv/src/taurus/vdk/csv_plugin.py b/projects/vdk-core/plugins/vdk-csv/src/vdk/internal/csv_plugin.py similarity index 93% rename from projects/vdk-core/plugins/vdk-csv/src/taurus/vdk/csv_plugin.py rename to projects/vdk-core/plugins/vdk-csv/src/vdk/internal/csv_plugin.py index 458619bab9..a00313db28 100644 --- a/projects/vdk-core/plugins/vdk-csv/src/taurus/vdk/csv_plugin.py +++ b/projects/vdk-core/plugins/vdk-csv/src/vdk/internal/csv_plugin.py @@ -9,9 +9,9 @@ import click from click import Context -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.run.cli_run import run -from taurus.vdk.csv_ingest_job import csv_ingest_step +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.run.cli_run import run +from vdk.internal.csv_ingest_job import csv_ingest_step log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-csv/tests/functional/test_csv_plugin.py b/projects/vdk-core/plugins/vdk-csv/tests/functional/test_csv_plugin.py index 0c18d0e56f..35f49f9e36 100644 --- a/projects/vdk-core/plugins/vdk-csv/tests/functional/test_csv_plugin.py +++ b/projects/vdk-core/plugins/vdk-csv/tests/functional/test_csv_plugin.py @@ -4,10 +4,10 @@ from unittest import mock from click.testing import Result -from taurus.vdk import csv_plugin -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_plugins import IngestIntoMemoryPlugin +from vdk.internal import csv_plugin +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_plugins import IngestIntoMemoryPlugin def _get_file(filename): diff --git a/projects/vdk-core/plugins/vdk-ingest-file/setup.py b/projects/vdk-core/plugins/vdk-ingest-file/setup.py index 85358cb05e..6c81ba856b 100644 --- a/projects/vdk-core/plugins/vdk-ingest-file/setup.py +++ b/projects/vdk-core/plugins/vdk-ingest-file/setup.py @@ -17,7 +17,7 @@ package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), entry_points={ - "vdk.plugin.run": ["vdk-ingest-file = taurus.vdk.ingest_file_plugin"] + "vdk.plugin.run": ["vdk-ingest-file = vdk.internal.ingest_file_plugin"] }, classifiers=[ "Development Status :: 4 - Beta", diff --git a/projects/vdk-core/plugins/vdk-ingest-file/src/taurus/vdk/ingest_file_plugin.py b/projects/vdk-core/plugins/vdk-ingest-file/src/vdk/internal/ingest_file_plugin.py similarity index 59% rename from projects/vdk-core/plugins/vdk-ingest-file/src/taurus/vdk/ingest_file_plugin.py rename to projects/vdk-core/plugins/vdk-ingest-file/src/vdk/internal/ingest_file_plugin.py index c78abc9aed..689d4e49bd 100644 --- a/projects/vdk-core/plugins/vdk-ingest-file/src/taurus/vdk/ingest_file_plugin.py +++ b/projects/vdk-core/plugins/vdk-ingest-file/src/vdk/internal/ingest_file_plugin.py @@ -5,11 +5,11 @@ """ import logging -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.ingestion.ingester_base import IIngesterPlugin -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.ingestion_to_file import IngestionToFile +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.ingestion.ingester_base import IIngesterPlugin +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.ingestion_to_file import IngestionToFile log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-ingest-file/src/taurus/vdk/ingestion_to_file.py b/projects/vdk-core/plugins/vdk-ingest-file/src/vdk/internal/ingestion_to_file.py similarity index 97% rename from projects/vdk-core/plugins/vdk-ingest-file/src/taurus/vdk/ingestion_to_file.py rename to projects/vdk-core/plugins/vdk-ingest-file/src/vdk/internal/ingestion_to_file.py index a16a953111..cff227ee46 100644 --- a/projects/vdk-core/plugins/vdk-ingest-file/src/taurus/vdk/ingestion_to_file.py +++ b/projects/vdk-core/plugins/vdk-ingest-file/src/vdk/internal/ingestion_to_file.py @@ -6,7 +6,7 @@ from typing import List from typing import Optional -from taurus.api.plugin.plugin_input import IIngesterPlugin +from vdk.api.plugin.plugin_input import IIngesterPlugin log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-ingest-file/tests/test_ingestion_to_file.py b/projects/vdk-core/plugins/vdk-ingest-file/tests/test_ingestion_to_file.py index 94311e0dd5..8608e0f931 100644 --- a/projects/vdk-core/plugins/vdk-ingest-file/tests/test_ingestion_to_file.py +++ b/projects/vdk-core/plugins/vdk-ingest-file/tests/test_ingestion_to_file.py @@ -4,7 +4,7 @@ from unittest.mock import mock_open from unittest.mock import patch -from taurus.vdk.ingestion_to_file import IngestionToFile +from vdk.internal.ingestion_to_file import IngestionToFile def test_ingestion_to_file(): diff --git a/projects/vdk-core/plugins/vdk-ingest-http/setup.py b/projects/vdk-core/plugins/vdk-ingest-http/setup.py index 3c7534a33a..0331c28540 100644 --- a/projects/vdk-core/plugins/vdk-ingest-http/setup.py +++ b/projects/vdk-core/plugins/vdk-ingest-http/setup.py @@ -17,7 +17,7 @@ package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), entry_points={ - "vdk.plugin.run": ["vdk-ingest-http = taurus.vdk.ingest_http_plugin"] + "vdk.plugin.run": ["vdk-ingest-http = vdk.internal.ingest_http_plugin"] }, classifiers=[ "Development Status :: 4 - Beta", diff --git a/projects/vdk-core/plugins/vdk-ingest-http/src/taurus/vdk/ingest_http_plugin.py b/projects/vdk-core/plugins/vdk-ingest-http/src/vdk/internal/ingest_http_plugin.py similarity index 64% rename from projects/vdk-core/plugins/vdk-ingest-http/src/taurus/vdk/ingest_http_plugin.py rename to projects/vdk-core/plugins/vdk-ingest-http/src/vdk/internal/ingest_http_plugin.py index 082d8b257c..d1df691ddd 100644 --- a/projects/vdk-core/plugins/vdk-ingest-http/src/taurus/vdk/ingest_http_plugin.py +++ b/projects/vdk-core/plugins/vdk-ingest-http/src/vdk/internal/ingest_http_plugin.py @@ -5,10 +5,10 @@ """ import logging -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.ingestion.ingester_base import IIngesterPlugin -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.ingest_over_http import IngestOverHttp +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.ingestion.ingester_base import IIngesterPlugin +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.ingest_over_http import IngestOverHttp log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-ingest-http/src/taurus/vdk/ingest_over_http.py b/projects/vdk-core/plugins/vdk-ingest-http/src/vdk/internal/ingest_over_http.py similarity index 97% rename from projects/vdk-core/plugins/vdk-ingest-http/src/taurus/vdk/ingest_over_http.py rename to projects/vdk-core/plugins/vdk-ingest-http/src/vdk/internal/ingest_over_http.py index 38df60470b..7c2c172326 100644 --- a/projects/vdk-core/plugins/vdk-ingest-http/src/taurus/vdk/ingest_over_http.py +++ b/projects/vdk-core/plugins/vdk-ingest-http/src/vdk/internal/ingest_over_http.py @@ -5,8 +5,8 @@ from typing import Optional import requests -from taurus.vdk.builtin_plugins.ingestion.ingester_base import IIngesterPlugin -from taurus.vdk.core import errors +from vdk.internal.builtin_plugins.ingestion.ingester_base import IIngesterPlugin +from vdk.internal.core import errors log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-ingest-http/tests/functional/jobs/ingest-job/ingest_test_data.py b/projects/vdk-core/plugins/vdk-ingest-http/tests/functional/jobs/ingest-job/ingest_test_data.py index 58852be105..c3c9694743 100644 --- a/projects/vdk-core/plugins/vdk-ingest-http/tests/functional/jobs/ingest-job/ingest_test_data.py +++ b/projects/vdk-core/plugins/vdk-ingest-http/tests/functional/jobs/ingest-job/ingest_test_data.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput): diff --git a/projects/vdk-core/plugins/vdk-ingest-http/tests/functional/test_http_ingest.py b/projects/vdk-core/plugins/vdk-ingest-http/tests/functional/test_http_ingest.py index 7b5ce52c44..1259e4db66 100644 --- a/projects/vdk-core/plugins/vdk-ingest-http/tests/functional/test_http_ingest.py +++ b/projects/vdk-core/plugins/vdk-ingest-http/tests/functional/test_http_ingest.py @@ -6,10 +6,10 @@ from click.testing import Result from pytest_httpserver.pytest_plugin import PluginHTTPServer -from taurus.vdk import ingest_http_plugin -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_funcs import get_test_job_path +from vdk.internal import ingest_http_plugin +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_funcs import get_test_job_path from werkzeug import Response diff --git a/projects/vdk-core/plugins/vdk-ingest-http/tests/test_ingest_over_http.py b/projects/vdk-core/plugins/vdk-ingest-http/tests/test_ingest_over_http.py index 7d8c391457..5029ff7459 100644 --- a/projects/vdk-core/plugins/vdk-ingest-http/tests/test_ingest_over_http.py +++ b/projects/vdk-core/plugins/vdk-ingest-http/tests/test_ingest_over_http.py @@ -4,11 +4,11 @@ from unittest import mock import pytest -from taurus.api.plugin.plugin_registry import PluginException -from taurus.vdk.core.errors import PlatformServiceError -from taurus.vdk.core.errors import UserCodeError -from taurus.vdk.core.errors import VdkConfigurationError -from taurus.vdk.ingest_over_http import IngestOverHttp +from vdk.api.plugin.plugin_registry import PluginException +from vdk.internal.core.errors import PlatformServiceError +from vdk.internal.core.errors import UserCodeError +from vdk.internal.core.errors import VdkConfigurationError +from vdk.internal.ingest_over_http import IngestOverHttp payload: dict = { "@id": "test_id", diff --git a/projects/vdk-core/plugins/vdk-logging-json/README.md b/projects/vdk-core/plugins/vdk-logging-json/README.md index 483fdf4225..9c7d341a28 100644 --- a/projects/vdk-core/plugins/vdk-logging-json/README.md +++ b/projects/vdk-core/plugins/vdk-logging-json/README.md @@ -28,6 +28,6 @@ pip install vdk-logging-json And all logs will be automatically formatted to JSON. They will appear like this: ``` -{"@timestamp":"2021-08-04T12:51:11.532Z","created":"1628070671","jobname":"example-job","level":"DEBUG","modulename":"taurus.vdk.trino_connection","filename":"managed_connection_base.py","lineno":"69","funcname":"connect","attemptid":"1628070671-452613-739749","message":"Established "} -{"@timestamp":"2021-08-04T12:51:11.532Z","created:1628070671","jobname":"example-job","level":"DEBUG","modulename":"taurus.vdk.trino_connection","filename":"managed_cursor.py","lineno":"29","funcname":"execute","attemptid":"1628070671-452613-739749","message":"Executing query: select 1"} +{"@timestamp":"2021-08-04T12:51:11.532Z","created":"1628070671","jobname":"example-job","level":"DEBUG","modulename":"vdk.internal.trino_connection","filename":"managed_connection_base.py","lineno":"69","funcname":"connect","attemptid":"1628070671-452613-739749","message":"Established "} +{"@timestamp":"2021-08-04T12:51:11.532Z","created:1628070671","jobname":"example-job","level":"DEBUG","modulename":"vdk.internal.trino_connection","filename":"managed_cursor.py","lineno":"29","funcname":"execute","attemptid":"1628070671-452613-739749","message":"Executing query: select 1"} ``` diff --git a/projects/vdk-core/plugins/vdk-logging-json/setup.py b/projects/vdk-core/plugins/vdk-logging-json/setup.py index 95985f00a6..eae91ea54a 100644 --- a/projects/vdk-core/plugins/vdk-logging-json/setup.py +++ b/projects/vdk-core/plugins/vdk-logging-json/setup.py @@ -16,7 +16,7 @@ install_requires=["vdk-core"], package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), - entry_points={"vdk.plugin.run": ["vdk-logging-json = taurus.vdk.logging_json"]}, + entry_points={"vdk.plugin.run": ["vdk-logging-json = vdk.internal.logging_json"]}, classifiers=[ "Development Status :: 4 - Beta", "License :: OSI Approved :: Apache Software License", diff --git a/projects/vdk-core/plugins/vdk-logging-json/src/taurus/vdk/logging_json.py b/projects/vdk-core/plugins/vdk-logging-json/src/vdk/internal/logging_json.py similarity index 89% rename from projects/vdk-core/plugins/vdk-logging-json/src/taurus/vdk/logging_json.py rename to projects/vdk-core/plugins/vdk-logging-json/src/vdk/internal/logging_json.py index 320495f83b..1a5d5313ef 100644 --- a/projects/vdk-core/plugins/vdk-logging-json/src/taurus/vdk/logging_json.py +++ b/projects/vdk-core/plugins/vdk-logging-json/src/vdk/internal/logging_json.py @@ -2,9 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core.statestore import CommonStoreKeys +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.core.statestore import CommonStoreKeys # the labels follow the labelling recommendations found here: http://ltsv.org/ format_template = ( diff --git a/projects/vdk-core/plugins/vdk-logging-json/tests/test_logging_json.py b/projects/vdk-core/plugins/vdk-logging-json/tests/test_logging_json.py index dcf4df5090..4591bd86a4 100644 --- a/projects/vdk-core/plugins/vdk-logging-json/tests/test_logging_json.py +++ b/projects/vdk-core/plugins/vdk-logging-json/tests/test_logging_json.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.vdk.logging_json import format_template +from vdk.internal.logging_json import format_template def test_json_logging(): diff --git a/projects/vdk-core/plugins/vdk-logging-ltsv/README.md b/projects/vdk-core/plugins/vdk-logging-ltsv/README.md index 10603fab0a..1ceb434eb3 100644 --- a/projects/vdk-core/plugins/vdk-logging-ltsv/README.md +++ b/projects/vdk-core/plugins/vdk-logging-ltsv/README.md @@ -24,6 +24,6 @@ pip install vdk-logging-ltsv And all logs will be automatically formatted to LTSV format. They would start to look something like this: ``` -@timestamp:2021-08-04T12:51:11 created:1628070671 jobname:example-job level:DEBUG modulename:taurus.vdk.trino_connection filename:managed_connection_base.py lineno:69 funcname:connect attemptid:1628070671-452613-739749 message:Established -@timestamp:2021-08-04T12:51:11 created:1628070671 jobname:example-job level:DEBUG modulename:taurus.vdk.trino_connection filename:managed_cursor.py lineno:29 funcname:execute attemptid:1628070671-452613-739749 message:Executing query: select 1 +@timestamp:2021-08-04T12:51:11 created:1628070671 jobname:example-job level:DEBUG modulename:vdk.internal.trino_connection filename:managed_connection_base.py lineno:69 funcname:connect attemptid:1628070671-452613-739749 message:Established +@timestamp:2021-08-04T12:51:11 created:1628070671 jobname:example-job level:DEBUG modulename:vdk.internal.trino_connection filename:managed_cursor.py lineno:29 funcname:execute attemptid:1628070671-452613-739749 message:Executing query: select 1 ``` diff --git a/projects/vdk-core/plugins/vdk-logging-ltsv/setup.py b/projects/vdk-core/plugins/vdk-logging-ltsv/setup.py index 30a553b18c..3a5eb705f6 100644 --- a/projects/vdk-core/plugins/vdk-logging-ltsv/setup.py +++ b/projects/vdk-core/plugins/vdk-logging-ltsv/setup.py @@ -16,7 +16,7 @@ install_requires=["vdk-core"], package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), - entry_points={"vdk.plugin.run": ["vdk-logging-ltsv = taurus.vdk.logging_ltsv"]}, + entry_points={"vdk.plugin.run": ["vdk-logging-ltsv = vdk.internal.logging_ltsv"]}, classifiers=[ "Development Status :: 4 - Beta", "License :: OSI Approved :: Apache Software License", diff --git a/projects/vdk-core/plugins/vdk-logging-ltsv/src/taurus/vdk/logging_ltsv.py b/projects/vdk-core/plugins/vdk-logging-ltsv/src/vdk/internal/logging_ltsv.py similarity index 81% rename from projects/vdk-core/plugins/vdk-logging-ltsv/src/taurus/vdk/logging_ltsv.py rename to projects/vdk-core/plugins/vdk-logging-ltsv/src/vdk/internal/logging_ltsv.py index d199dd7d1d..d6fe17b5b8 100644 --- a/projects/vdk-core/plugins/vdk-logging-ltsv/src/taurus/vdk/logging_ltsv.py +++ b/projects/vdk-core/plugins/vdk-logging-ltsv/src/vdk/internal/logging_ltsv.py @@ -2,9 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core.statestore import CommonStoreKeys +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.core.statestore import CommonStoreKeys # the labels follow the labelling recommendations found here: http://ltsv.org/ format_template = ( diff --git a/projects/vdk-core/plugins/vdk-logging-ltsv/tests/test_logging_ltsv.py b/projects/vdk-core/plugins/vdk-logging-ltsv/tests/test_logging_ltsv.py index 4181bbd03a..33dc774b5a 100644 --- a/projects/vdk-core/plugins/vdk-logging-ltsv/tests/test_logging_ltsv.py +++ b/projects/vdk-core/plugins/vdk-logging-ltsv/tests/test_logging_ltsv.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.vdk.logging_ltsv import format_template +from vdk.internal.logging_ltsv import format_template def test_ltsv_logging(): diff --git a/projects/vdk-core/plugins/vdk-plugin-control-cli/setup.py b/projects/vdk-core/plugins/vdk-plugin-control-cli/setup.py index 5646262e7e..abdd9b7427 100644 --- a/projects/vdk-core/plugins/vdk-plugin-control-cli/setup.py +++ b/projects/vdk-core/plugins/vdk-plugin-control-cli/setup.py @@ -21,8 +21,8 @@ packages=setuptools.find_namespace_packages(where="src"), entry_points={ "vdk.plugin.run": [ - "vdk-plugin-control-cli = taurus.vdk.vdk_plugin_control_cli", - "vdk-control-service-properties = taurus.vdk.properties_plugin", + "vdk-plugin-control-cli = vdk.internal.vdk_plugin_control_cli", + "vdk-control-service-properties = vdk.internal.properties_plugin", ] }, classifiers=[ diff --git a/projects/vdk-core/plugins/vdk-plugin-control-cli/src/taurus/vdk/vdk_plugin_control_cli.py b/projects/vdk-core/plugins/vdk-plugin-control-cli/src/taurus/vdk/vdk_plugin_control_cli.py deleted file mode 100644 index fef093abe0..0000000000 --- a/projects/vdk-core/plugins/vdk-plugin-control-cli/src/taurus/vdk/vdk_plugin_control_cli.py +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2021 VMware, Inc. -# SPDX-License-Identifier: Apache-2.0 -import click -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.control.command_groups.common_group.default import reset_default_command -from taurus.vdk.control.command_groups.common_group.default import set_default_command -from taurus.vdk.control.command_groups.job.create import create -from taurus.vdk.control.command_groups.job.delete import delete -from taurus.vdk.control.command_groups.job.deploy_cli import deploy -from taurus.vdk.control.command_groups.job.download_job import download_job -from taurus.vdk.control.command_groups.job.download_key import download_key -from taurus.vdk.control.command_groups.job.execute import execute -from taurus.vdk.control.command_groups.job.list import list_command -from taurus.vdk.control.command_groups.job.properties import properties_command -from taurus.vdk.control.command_groups.job.show import show_command -from taurus.vdk.control.command_groups.login_group.login import login -from taurus.vdk.control.command_groups.logout_group.logout import logout -from taurus.vdk.control.configuration.default_options import DefaultOptions -from taurus.vdk.plugin import control_plugin_manager - - -@hookimpl -def vdk_command_line(root_command: click.Group): - root_command.add_command(login) - root_command.add_command(logout) - root_command.add_command(delete) - root_command.add_command(create) - root_command.add_command(download_key) - root_command.add_command(list_command) - root_command.add_command(deploy) - root_command.add_command(execute) - root_command.add_command(download_job) - root_command.add_command(set_default_command) - root_command.add_command(reset_default_command) - root_command.add_command(show_command) - root_command.add_command(properties_command) - - plugins = control_plugin_manager.Plugins() - default_options = DefaultOptions(plugins) - if default_options.get_default_map(): - root_command.context_settings["default_map"] = default_options.get_default_map() diff --git a/projects/vdk-core/plugins/vdk-plugin-control-cli/src/taurus/vdk/control_service_properties.py b/projects/vdk-core/plugins/vdk-plugin-control-cli/src/vdk/internal/control_service_properties.py similarity index 98% rename from projects/vdk-core/plugins/vdk-plugin-control-cli/src/taurus/vdk/control_service_properties.py rename to projects/vdk-core/plugins/vdk-plugin-control-cli/src/vdk/internal/control_service_properties.py index 5c48f94983..b9b0991baa 100644 --- a/projects/vdk-core/plugins/vdk-plugin-control-cli/src/taurus/vdk/control_service_properties.py +++ b/projects/vdk-core/plugins/vdk-plugin-control-cli/src/vdk/internal/control_service_properties.py @@ -10,8 +10,8 @@ from requests.adapters import HTTPAdapter from requests.adapters import Retry from requests.auth import AuthBase -from taurus.api.plugin.plugin_input import IPropertiesServiceClient -from taurus.vdk.core import errors +from vdk.api.plugin.plugin_input import IPropertiesServiceClient +from vdk.internal.core import errors log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-plugin-control-cli/src/taurus/vdk/properties_plugin.py b/projects/vdk-core/plugins/vdk-plugin-control-cli/src/vdk/internal/properties_plugin.py similarity index 88% rename from projects/vdk-core/plugins/vdk-plugin-control-cli/src/taurus/vdk/properties_plugin.py rename to projects/vdk-core/plugins/vdk-plugin-control-cli/src/vdk/internal/properties_plugin.py index 869db232ae..ef2e98634c 100644 --- a/projects/vdk-core/plugins/vdk-plugin-control-cli/src/taurus/vdk/properties_plugin.py +++ b/projects/vdk-core/plugins/vdk-plugin-control-cli/src/vdk/internal/properties_plugin.py @@ -4,14 +4,14 @@ from typing import Optional from requests.auth import AuthBase -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.control.auth.auth import Authentication -from taurus.vdk.control.auth.login_types import LoginTypes -from taurus.vdk.control_service_properties import Authenticator -from taurus.vdk.control_service_properties import ControlPlanePropertiesServiceClient -from taurus.vdk.control_service_properties import NoneAuthenticator -from taurus.vdk.core.config import ConfigurationBuilder +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.control.auth.auth import Authentication +from vdk.internal.control.auth.login_types import LoginTypes +from vdk.internal.control_service_properties import Authenticator +from vdk.internal.control_service_properties import ControlPlanePropertiesServiceClient +from vdk.internal.control_service_properties import NoneAuthenticator +from vdk.internal.core.config import ConfigurationBuilder log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-plugin-control-cli/src/vdk/internal/vdk_plugin_control_cli.py b/projects/vdk-core/plugins/vdk-plugin-control-cli/src/vdk/internal/vdk_plugin_control_cli.py new file mode 100644 index 0000000000..d5ebcb18de --- /dev/null +++ b/projects/vdk-core/plugins/vdk-plugin-control-cli/src/vdk/internal/vdk_plugin_control_cli.py @@ -0,0 +1,43 @@ +# Copyright 2021 VMware, Inc. +# SPDX-License-Identifier: Apache-2.0 +import click +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.control.command_groups.common_group.default import ( + reset_default_command, +) +from vdk.internal.control.command_groups.common_group.default import set_default_command +from vdk.internal.control.command_groups.job.create import create +from vdk.internal.control.command_groups.job.delete import delete +from vdk.internal.control.command_groups.job.deploy_cli import deploy +from vdk.internal.control.command_groups.job.download_job import download_job +from vdk.internal.control.command_groups.job.download_key import download_key +from vdk.internal.control.command_groups.job.execute import execute +from vdk.internal.control.command_groups.job.list import list_command +from vdk.internal.control.command_groups.job.properties import properties_command +from vdk.internal.control.command_groups.job.show import show_command +from vdk.internal.control.command_groups.login_group.login import login +from vdk.internal.control.command_groups.logout_group.logout import logout +from vdk.internal.control.configuration.default_options import DefaultOptions +from vdk.internal.plugin import control_plugin_manager + + +@hookimpl +def vdk_command_line(root_command: click.Group): + root_command.add_command(login) + root_command.add_command(logout) + root_command.add_command(delete) + root_command.add_command(create) + root_command.add_command(download_key) + root_command.add_command(list_command) + root_command.add_command(deploy) + root_command.add_command(execute) + root_command.add_command(download_job) + root_command.add_command(set_default_command) + root_command.add_command(reset_default_command) + root_command.add_command(show_command) + root_command.add_command(properties_command) + + plugins = control_plugin_manager.Plugins() + default_options = DefaultOptions(plugins) + if default_options.get_default_map(): + root_command.context_settings["default_map"] = default_options.get_default_map() diff --git a/projects/vdk-core/plugins/vdk-plugin-control-cli/tests/test_control_service_properties.py b/projects/vdk-core/plugins/vdk-plugin-control-cli/tests/test_control_service_properties.py index 49ca396918..42f0edef72 100644 --- a/projects/vdk-core/plugins/vdk-plugin-control-cli/tests/test_control_service_properties.py +++ b/projects/vdk-core/plugins/vdk-plugin-control-cli/tests/test_control_service_properties.py @@ -4,10 +4,10 @@ import pytest from pytest_httpserver.pytest_plugin import PluginHTTPServer -from taurus.vdk.control_service_properties import ControlPlanePropertiesServiceClient -from taurus.vdk.core.errors import PlatformServiceError -from taurus.vdk.core.errors import UserCodeError -from taurus.vdk.core.errors import VdkConfigurationError +from vdk.internal.control_service_properties import ControlPlanePropertiesServiceClient +from vdk.internal.core.errors import PlatformServiceError +from vdk.internal.core.errors import UserCodeError +from vdk.internal.core.errors import VdkConfigurationError from werkzeug import Request from werkzeug import Response diff --git a/projects/vdk-core/plugins/vdk-plugin-control-cli/tests/test_vdk_plugin_control_cli.py b/projects/vdk-core/plugins/vdk-plugin-control-cli/tests/test_vdk_plugin_control_cli.py index 6c4ba03541..69e45c3c10 100644 --- a/projects/vdk-core/plugins/vdk-plugin-control-cli/tests/test_vdk_plugin_control_cli.py +++ b/projects/vdk-core/plugins/vdk-plugin-control-cli/tests/test_vdk_plugin_control_cli.py @@ -1,8 +1,8 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.vdk import vdk_plugin_control_cli -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal import vdk_plugin_control_cli +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner def test_vdk_plugin_control_cli(): diff --git a/projects/vdk-core/plugins/vdk-postgres/setup.py b/projects/vdk-core/plugins/vdk-postgres/setup.py index 8ecc4cec12..039210f720 100644 --- a/projects/vdk-core/plugins/vdk-postgres/setup.py +++ b/projects/vdk-core/plugins/vdk-postgres/setup.py @@ -17,7 +17,7 @@ package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), include_package_data=True, - entry_points={"vdk.plugin.run": ["vdk-postgres = taurus.vdk.postgres_plugin"]}, + entry_points={"vdk.plugin.run": ["vdk-postgres = vdk.internal.postgres_plugin"]}, classifiers=[ "Development Status :: 4 - Beta", "License :: OSI Approved :: Apache Software License", diff --git a/projects/vdk-core/plugins/vdk-postgres/src/taurus/vdk/postgres_connection.py b/projects/vdk-core/plugins/vdk-postgres/src/vdk/internal/postgres_connection.py similarity index 97% rename from projects/vdk-core/plugins/vdk-postgres/src/taurus/vdk/postgres_connection.py rename to projects/vdk-core/plugins/vdk-postgres/src/vdk/internal/postgres_connection.py index 7364246144..66f890ae7f 100644 --- a/projects/vdk-core/plugins/vdk-postgres/src/taurus/vdk/postgres_connection.py +++ b/projects/vdk-core/plugins/vdk-postgres/src/vdk/internal/postgres_connection.py @@ -5,7 +5,7 @@ from typing import List from typing import Optional -from taurus.vdk.builtin_plugins.connection.managed_connection_base import ( +from vdk.internal.builtin_plugins.connection.managed_connection_base import ( ManagedConnectionBase, ) diff --git a/projects/vdk-core/plugins/vdk-postgres/src/taurus/vdk/postgres_plugin.py b/projects/vdk-core/plugins/vdk-postgres/src/vdk/internal/postgres_plugin.py similarity index 88% rename from projects/vdk-core/plugins/vdk-postgres/src/taurus/vdk/postgres_plugin.py rename to projects/vdk-core/plugins/vdk-postgres/src/vdk/internal/postgres_plugin.py index 173e63c38a..7c88678131 100644 --- a/projects/vdk-core/plugins/vdk-postgres/src/taurus/vdk/postgres_plugin.py +++ b/projects/vdk-core/plugins/vdk-postgres/src/vdk/internal/postgres_plugin.py @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 import click from tabulate import tabulate -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.postgres_connection import PostgresConnection +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.core.config import Configuration +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.postgres_connection import PostgresConnection def _connection_by_configuration(configuration: Configuration): diff --git a/projects/vdk-core/plugins/vdk-postgres/tests/conftest.py b/projects/vdk-core/plugins/vdk-postgres/tests/conftest.py index dd5364eb34..621586ceab 100644 --- a/projects/vdk-core/plugins/vdk-postgres/tests/conftest.py +++ b/projects/vdk-core/plugins/vdk-postgres/tests/conftest.py @@ -5,8 +5,8 @@ from unittest import mock import pytest -from taurus.vdk import postgres_plugin -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal import postgres_plugin +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner VDK_DB_DEFAULT_TYPE = "VDK_DB_DEFAULT_TYPE" VDK_POSTGRES_DBNAME = "VDK_POSTGRES_DBNAME" diff --git a/projects/vdk-core/plugins/vdk-postgres/tests/test_vdk_postgres_utils.py b/projects/vdk-core/plugins/vdk-postgres/tests/test_vdk_postgres_utils.py index 7730274453..ab3795e1c5 100644 --- a/projects/vdk-core/plugins/vdk-postgres/tests/test_vdk_postgres_utils.py +++ b/projects/vdk-core/plugins/vdk-postgres/tests/test_vdk_postgres_utils.py @@ -6,10 +6,10 @@ import pytest from click.testing import Result -from taurus.vdk import postgres_plugin -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_funcs import jobs_path_from_caller_directory +from vdk.internal import postgres_plugin +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_funcs import jobs_path_from_caller_directory VDK_DB_DEFAULT_TYPE = "VDK_DB_DEFAULT_TYPE" VDK_POSTGRES_DBNAME = "VDK_POSTGRES_DBNAME" diff --git a/projects/vdk-core/plugins/vdk-server/MANIFEST.in b/projects/vdk-core/plugins/vdk-server/MANIFEST.in index 949315d180..e7704e2b28 100644 --- a/projects/vdk-core/plugins/vdk-server/MANIFEST.in +++ b/projects/vdk-core/plugins/vdk-server/MANIFEST.in @@ -1,4 +1,4 @@ -include src/taurus/vdk/* +include src/vdk/internal/* # this only work for source distribution (setup.py sdist) and not for binary distribution (bdist) # https://packaging.python.org/guides/using-manifest-in/ diff --git a/projects/vdk-core/plugins/vdk-server/setup.py b/projects/vdk-core/plugins/vdk-server/setup.py index b548095152..34e5960e67 100644 --- a/projects/vdk-core/plugins/vdk-server/setup.py +++ b/projects/vdk-core/plugins/vdk-server/setup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 VMware, Inc. +# Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 import pathlib @@ -17,7 +17,7 @@ package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), include_package_data=True, - entry_points={"vdk.plugin.run": ["vdk-server = taurus.vdk.server_plugin"]}, + entry_points={"vdk.plugin.run": ["vdk-server = vdk.internal.server_plugin"]}, classifiers=[ "Development Status :: 4 - Beta", "License :: OSI Approved :: Apache Software License", diff --git a/projects/vdk-core/plugins/vdk-server/src/taurus/vdk/configmap-local-registry-hosting-template.yaml b/projects/vdk-core/plugins/vdk-server/src/vdk/internal/configmap-local-registry-hosting-template.yaml similarity index 73% rename from projects/vdk-core/plugins/vdk-server/src/taurus/vdk/configmap-local-registry-hosting-template.yaml rename to projects/vdk-core/plugins/vdk-server/src/vdk/internal/configmap-local-registry-hosting-template.yaml index b443a41ee3..5591391a8f 100644 --- a/projects/vdk-core/plugins/vdk-server/src/taurus/vdk/configmap-local-registry-hosting-template.yaml +++ b/projects/vdk-core/plugins/vdk-server/src/vdk/internal/configmap-local-registry-hosting-template.yaml @@ -6,4 +6,4 @@ metadata: data: localRegistryHosting.v1: | host: "localhost:{docker_registry_port}" - help: "https://kind.sigs.k8s.io/docs/user/local-registry/" \ No newline at end of file + help: "https://kind.sigs.k8s.io/docs/user/local-registry/" diff --git a/projects/vdk-core/plugins/vdk-server/src/taurus/vdk/ingress-nginx-deploy.yaml b/projects/vdk-core/plugins/vdk-server/src/vdk/internal/ingress-nginx-deploy.yaml similarity index 99% rename from projects/vdk-core/plugins/vdk-server/src/taurus/vdk/ingress-nginx-deploy.yaml rename to projects/vdk-core/plugins/vdk-server/src/vdk/internal/ingress-nginx-deploy.yaml index 71283dfc53..48ca056b28 100644 --- a/projects/vdk-core/plugins/vdk-server/src/taurus/vdk/ingress-nginx-deploy.yaml +++ b/projects/vdk-core/plugins/vdk-server/src/vdk/internal/ingress-nginx-deploy.yaml @@ -684,4 +684,4 @@ spec: kubernetes.io/os: linux securityContext: runAsNonRoot: true - runAsUser: 2000 \ No newline at end of file + runAsUser: 2000 diff --git a/projects/vdk-core/plugins/vdk-server/src/taurus/vdk/installer.py b/projects/vdk-core/plugins/vdk-server/src/vdk/internal/installer.py similarity index 62% rename from projects/vdk-core/plugins/vdk-server/src/taurus/vdk/installer.py rename to projects/vdk-core/plugins/vdk-server/src/vdk/internal/installer.py index 7347697c67..7f7e194fb0 100644 --- a/projects/vdk-core/plugins/vdk-server/src/taurus/vdk/installer.py +++ b/projects/vdk-core/plugins/vdk-server/src/vdk/internal/installer.py @@ -1,27 +1,33 @@ +# Copyright 2021 VMware, Inc. +# SPDX-License-Identifier: Apache-2.0 import base64 -import time - -import docker import logging import os import pathlib import subprocess import sys -import requests -from kubernetes import client, config, utils, watch +import time -from taurus.vdk.core.errors import BaseVdkError, ErrorMessage +import docker +import requests +from kubernetes import client +from kubernetes import config +from kubernetes import utils +from kubernetes import watch +from vdk.internal.core.errors import BaseVdkError +from vdk.internal.core.errors import ErrorMessage log = logging.getLogger(__name__) -class Installer(object): +class Installer: """ Installs the Versatile Data Kit Helm Chart along with a private Docker registry and a private Git server. Only Kind clusters are supported currently. Based on this script: https://kind.sigs.k8s.io/docs/user/local-registry/ """ + kind_cluster_name = "vdk" docker_registry_container_name = "vdk-docker-registry" # Currently changing the default Docker registry port does not work correctly, @@ -85,14 +91,17 @@ def __create_docker_registry_container(self): except: try: # docker run -d --restart=always -p "127.0.0.1:${docker_registry_port}:5000" --name "${docker_registry_name}" registry:2 - docker_client.containers.run("registry:2", - detach=True, - restart_policy={"Name": "always"}, - name=self.docker_registry_container_name, - ports={'5000/tcp': ('127.0.0.1', self.__docker_registry_port)}) + docker_client.containers.run( + "registry:2", + detach=True, + restart_policy={"Name": "always"}, + name=self.docker_registry_container_name, + ports={"5000/tcp": ("127.0.0.1", self.__docker_registry_port)}, + ) except Exception as ex: log.error( - f"Error: Failed to create Docker registry container {self.docker_registry_container_name}. {str(ex)}") + f"Error: Failed to create Docker registry container {self.docker_registry_container_name}. {str(ex)}" + ) finally: docker_client.close() @@ -110,7 +119,9 @@ def __delete_container(container_name: str): docker_client.api.stop(container_name) docker_client.api.remove_container(container_name) except Exception as ex: - log.error(f"Error: Failed to remove Docker container {container_name}. {str(ex)}") + log.error( + f"Error: Failed to remove Docker container {container_name}. {str(ex)}" + ) finally: docker_client.close() @@ -148,13 +159,17 @@ def __create_git_server_container(self) -> bool: except: try: # docker run --name=vdk-git-server -p 10022:22 -p 10080:3000 -p 10081:80 gogs/gogs:0.12 - docker_client.containers.run("gogs/gogs:0.12", - detach=True, - name=self.git_server_container_name, - ports={'22/tcp': '10022', '3000/tcp': '10080', '80/tcp': '10081'}) + docker_client.containers.run( + "gogs/gogs:0.12", + detach=True, + name=self.git_server_container_name, + ports={"22/tcp": "10022", "3000/tcp": "10080", "80/tcp": "10081"}, + ) return True except Exception as ex: - log.error(f"Error: Failed to create Git server container {self.git_server_container_name}. {str(ex)}") + log.error( + f"Error: Failed to create Git server container {self.git_server_container_name}. {str(ex)}" + ) finally: docker_client.close() @@ -186,15 +201,19 @@ def __resolve_container_ip(self, container_name): # Find the id of the "kind" network # docker network ls networks = docker_client.api.networks() - kind_network = next((n for n in networks if n['Name'] == 'kind'), None) + kind_network = next((n for n in networks if n["Name"] == "kind"), None) # Find the "kind" network configuration # docker network inspect "{kind_net_id}" - kind_network_details = docker_client.api.inspect_network(kind_network['Id']) + kind_network_details = docker_client.api.inspect_network(kind_network["Id"]) # Extract the container's IP - containers = kind_network_details['Containers'] - container_id = next((c for c in containers if containers[c]['Name'] == container_name), None) + containers = kind_network_details["Containers"] + container_id = next( + (c for c in containers if containers[c]["Name"] == container_name), None + ) if container_id: - return self.__remove_ip_subnet_mask(containers[container_id]['IPv4Address']) + return self.__remove_ip_subnet_mask( + containers[container_id]["IPv4Address"] + ) except Exception as ex: log.info(ex) finally: @@ -202,7 +221,7 @@ def __resolve_container_ip(self, container_name): @staticmethod def __remove_ip_subnet_mask(ip: str) -> str: - pos = ip.find('/') + pos = ip.find("/") if pos == -1: return ip return ip[:pos] @@ -227,7 +246,9 @@ def __configure_git_server_with_error_handling(self): except Exception as ex: ex_as_string = str(ex) if "Connection reset by peer" in ex_as_string: - log.debug(f"Failed to configure git server. Will reattempt in 2 seconds...") + log.debug( + f"Failed to configure git server. Will reattempt in 2 seconds..." + ) attempt += 1 time.sleep(2) continue @@ -243,30 +264,32 @@ def __configure_git_server(self): """ # curl -X POST 'http://localhost:10080/install' \ # -d "db_type=SQLite3&db_path=data/gogs.db&app_name=Gogs&repo_root_path=/data/git/gogs-repositories&run_user=git&domain=localhost&ssh_port=22&http_port=80&app_url=http://localhost/&log_root_path=/app/gogs/log&smtp_host=&smtp_from=&smtp_user=&smtp_passwd=&disable_gravatar=true&enable_captcha=false®ister_confirm=false&admin_name=vdkuser&admin_passwd=vdkpass&admin_confirm_passwd=vdkpass&admin_email=vdk_user@vmware.com" - requests.post("http://localhost:10080/install", - data={ - 'db_type': 'SQLite3', - 'db_path': 'data/gogs.db', - 'app_name': 'Gogs', - 'repo_root_path': '/data/git/gogs-repositories', - 'run_user': 'git', - 'domain': 'localhost', - 'ssh_port': 22, - 'http_port': 80, - 'app_url': 'http://localhost/', - 'log_root_path': '/app/gogs/log', - 'smtp_host': '', - 'smtp_from': '', - 'smtp_user': '', - 'smtp_passwd': '', - 'disable_gravatar': 'true', - 'enable_captcha': 'false', - 'register_confirm': 'false', - 'admin_name': self.git_server_admin_user, - 'admin_passwd': self.git_server_admin_password, - 'admin_confirm_passwd': self.git_server_admin_password, - 'admin_email': self.git_server_admin_email - }) + requests.post( + "http://localhost:10080/install", + data={ + "db_type": "SQLite3", + "db_path": "data/gogs.db", + "app_name": "Gogs", + "repo_root_path": "/data/git/gogs-repositories", + "run_user": "git", + "domain": "localhost", + "ssh_port": 22, + "http_port": 80, + "app_url": "http://localhost/", + "log_root_path": "/app/gogs/log", + "smtp_host": "", + "smtp_from": "", + "smtp_user": "", + "smtp_passwd": "", + "disable_gravatar": "true", + "enable_captcha": "false", + "register_confirm": "false", + "admin_name": self.git_server_admin_user, + "admin_passwd": self.git_server_admin_password, + "admin_confirm_passwd": self.git_server_admin_password, + "admin_email": self.git_server_admin_email, + }, + ) def __create_git_repository(self): """ @@ -282,18 +305,24 @@ def __create_git_repository(self): # "private": false # }' try: - credentials = f"{self.git_server_admin_user}:{self.git_server_admin_password}" - base64_credentials = base64.b64encode(credentials.encode("ascii")).decode("ascii") - requests.post(f"http://localhost:10080/api/v1/admin/users/{self.git_server_admin_user}/repos", - headers={ - 'authorization': f'Basic {base64_credentials}', - 'content-type': 'application/json' - }, - json={ - 'name': self.git_server_repository_name, - 'description': 'A repository for storing the source code of VDK data jobs', - 'private': False - }) + credentials = ( + f"{self.git_server_admin_user}:{self.git_server_admin_password}" + ) + base64_credentials = base64.b64encode(credentials.encode("ascii")).decode( + "ascii" + ) + requests.post( + f"http://localhost:10080/api/v1/admin/users/{self.git_server_admin_user}/repos", + headers={ + "authorization": f"Basic {base64_credentials}", + "content-type": "application/json", + }, + json={ + "name": self.git_server_repository_name, + "description": "A repository for storing the source code of VDK data jobs", + "private": False, + }, + ) except Exception as ex: log.error(f"Error: Failed to create git repository. {str(ex)}") sys.exit(1) @@ -301,19 +330,24 @@ def __create_git_repository(self): @staticmethod def __transform_file(input_file_name, output_file_name, transformation): try: - with open(input_file_name, "r") as input_file: + with open(input_file_name) as input_file: content = input_file.read() transformed_content = transformation(content) with open(output_file_name, "w") as output_file: output_file.write(transformed_content) - except IOError as ex: + except OSError as ex: # TODO: fill in what/why/etc for the error message raise BaseVdkError( - ErrorMessage(f"Failed to transform file {input_file_name} into {output_file_name}. {str(ex)}")) + ErrorMessage( + f"Failed to transform file {input_file_name} into {output_file_name}. {str(ex)}" + ) + ) def __transform_template(self, content: str) -> str: - return content.format(docker_registry_name=self.docker_registry_container_name, - docker_registry_port=self.__docker_registry_port) + return content.format( + docker_registry_name=self.docker_registry_container_name, + docker_registry_port=self.__docker_registry_port, + ) def __create_kind_cluster(self): """ @@ -321,35 +355,49 @@ def __create_kind_cluster(self): """ temp_file = "kind-cluster-config.yaml" try: - self.__transform_file(self.__current_directory.joinpath("kind-cluster-config-template.yaml"), - temp_file, - self.__transform_template) + self.__transform_file( + self.__current_directory.joinpath("kind-cluster-config-template.yaml"), + temp_file, + self.__transform_template, + ) except Exception as ex: log.error(f"Failed to create Kind cluster. {str(ex)}") exit(1) try: - completed_process = subprocess.run(["kind", "create", "cluster", - "--config=kind-cluster-config.yaml", - "--name", self.kind_cluster_name]) + completed_process = subprocess.run( + [ + "kind", + "create", + "cluster", + "--config=kind-cluster-config.yaml", + "--name", + self.kind_cluster_name, + ] + ) if os.path.exists(temp_file): os.remove(temp_file) if completed_process.returncode == 1: sys.exit(1) except Exception as ex: - log.error(f"Failed to create Kind cluster. Make sure you have Kind installed. {str(ex)}") + log.error( + f"Failed to create Kind cluster. Make sure you have Kind installed. {str(ex)}" + ) def __delete_kind_cluster(self): """ Deletes the kind cluster. """ try: - completed_process = subprocess.run(["kind", "delete", "cluster", - "--name", self.kind_cluster_name]) + completed_process = subprocess.run( + ["kind", "delete", "cluster", "--name", self.kind_cluster_name] + ) if completed_process.returncode == 1: sys.exit(1) except Exception as ex: - log.error(f"Failed to delete Kind cluster. Make sure you have Kind installed. {str(ex)}") + log.error( + f"Failed to delete Kind cluster. Make sure you have Kind installed. {str(ex)}" + ) def __configure_kind_local_docker_registry(self): """ @@ -362,9 +410,12 @@ def __configure_kind_local_docker_registry(self): try: temp_file = "configmap-local-registry-hosting.yaml" self.__transform_file( - self.__current_directory.joinpath("configmap-local-registry-hosting-template.yaml"), + self.__current_directory.joinpath( + "configmap-local-registry-hosting-template.yaml" + ), temp_file, - self.__transform_template) + self.__transform_template, + ) utils.create_from_yaml(k8s_client, temp_file) if os.path.exists(temp_file): os.remove(temp_file) @@ -386,35 +437,63 @@ def __install_helm_chart(self): # The reason for this is unknown, but is suspected to be related to the Kaniko image that is # used as a base. git_server_ip = self.__resolve_container_ip(self.git_server_container_name) - subprocess.run(['helm', 'repo', 'add', self.helm_repo_local_name, self.helm_repo_url]) - subprocess.run(['helm', 'repo', 'update']) - subprocess.run(['helm', 'install', self.helm_installation_name, self.helm_chart_name, - '--atomic', - '--set', 'service.type=ClusterIP', - '--set', 'resources.limits.memory=1G', - '--set', 'cockroachdb.statefulset.replicas=1', - '--set', 'replicas=1', - '--set', 'ingress.enabled=true', - '--set', 'deploymentGitBranch=master', - '--set', 'deploymentDockerRegistryType=generic', - '--set', f'deploymentDockerRepository={self.docker_registry_container_name}:5000', - '--set', f'proxyRepositoryURL=localhost:5000', - '--set', f'deploymentGitUrl={git_server_ip}/{self.git_server_admin_user}/{self.git_server_repository_name}.git', - '--set', f'deploymentGitUsername={self.git_server_admin_user}', - '--set', f'deploymentGitPassword={self.git_server_admin_password}', - '--set', f'uploadGitReadWriteUsername={self.git_server_admin_user}', - '--set', f'uploadGitReadWritePassword={self.git_server_admin_password}', - '--set', 'extraEnvVars.GIT_SSL_ENABLED=false', - '--set', 'extraEnvVars.DATAJOBS_DEPLOYMENT_BUILDER_EXTRAARGS=--insecure', - ]) + subprocess.run( + ["helm", "repo", "add", self.helm_repo_local_name, self.helm_repo_url] + ) + subprocess.run(["helm", "repo", "update"]) + subprocess.run( + [ + "helm", + "install", + self.helm_installation_name, + self.helm_chart_name, + "--atomic", + "--set", + "service.type=ClusterIP", + "--set", + "resources.limits.memory=1G", + "--set", + "cockroachdb.statefulset.replicas=1", + "--set", + "replicas=1", + "--set", + "ingress.enabled=true", + "--set", + "deploymentGitBranch=master", + "--set", + "deploymentDockerRegistryType=generic", + "--set", + f"deploymentDockerRepository={self.docker_registry_container_name}:5000", + "--set", + f"proxyRepositoryURL=localhost:5000", + "--set", + f"deploymentGitUrl={git_server_ip}/{self.git_server_admin_user}/{self.git_server_repository_name}.git", + "--set", + f"deploymentGitUsername={self.git_server_admin_user}", + "--set", + f"deploymentGitPassword={self.git_server_admin_password}", + "--set", + f"uploadGitReadWriteUsername={self.git_server_admin_user}", + "--set", + f"uploadGitReadWritePassword={self.git_server_admin_password}", + "--set", + "extraEnvVars.GIT_SSL_ENABLED=false", + "--set", + "extraEnvVars.DATAJOBS_DEPLOYMENT_BUILDER_EXTRAARGS=--insecure", + ] + ) except Exception as ex: - log.error(f"Failed to install Helm chart. Make sure you have Helm installed. {str(ex)}") + log.error( + f"Failed to install Helm chart. Make sure you have Helm installed. {str(ex)}" + ) def __uninstall_helm_chart(self): try: subprocess.run(["helm", "uninstall", self.helm_installation_name]) except Exception as ex: - log.error(f"Failed to uninstall Helm chart. Make sure you have Helm installed. {str(ex)}") + log.error( + f"Failed to uninstall Helm chart. Make sure you have Helm installed. {str(ex)}" + ) def __install_ingress_prerequisites(self): """ @@ -426,7 +505,10 @@ def __install_ingress_prerequisites(self): config.load_kube_config() with client.ApiClient() as k8s_client: try: - utils.create_from_yaml(k8s_client, self.__current_directory.joinpath("ingress-nginx-deploy.yaml")) + utils.create_from_yaml( + k8s_client, + self.__current_directory.joinpath("ingress-nginx-deploy.yaml"), + ) except Exception as ex: log.info(ex) @@ -438,13 +520,21 @@ def __install_ingress_prerequisites(self): w = watch.Watch() k8s_client = client.CoreV1Api() try: - for event in w.stream(func=k8s_client.list_namespaced_pod, - namespace="ingress-nginx", - label_selector="app.kubernetes.io/component=controller", - timeout_seconds=150): - pod_status = event['object'].status - if pod_status.phase == 'Running' and \ - next((c for c in pod_status.conditions if c.type == 'Ready' and c.status == 'True'), None): + for event in w.stream( + func=k8s_client.list_namespaced_pod, + namespace="ingress-nginx", + label_selector="app.kubernetes.io/component=controller", + timeout_seconds=150, + ): + pod_status = event["object"].status + if pod_status.phase == "Running" and next( + ( + c + for c in pod_status.conditions + if c.type == "Ready" and c.status == "True" + ), + None, + ): break except Exception as ex: log.info(ex) diff --git a/projects/vdk-core/plugins/vdk-server/src/taurus/vdk/kind-cluster-config-template.yaml b/projects/vdk-core/plugins/vdk-server/src/vdk/internal/kind-cluster-config-template.yaml similarity index 98% rename from projects/vdk-core/plugins/vdk-server/src/taurus/vdk/kind-cluster-config-template.yaml rename to projects/vdk-core/plugins/vdk-server/src/vdk/internal/kind-cluster-config-template.yaml index 99346ffadb..73a369cd87 100644 --- a/projects/vdk-core/plugins/vdk-server/src/taurus/vdk/kind-cluster-config-template.yaml +++ b/projects/vdk-core/plugins/vdk-server/src/vdk/internal/kind-cluster-config-template.yaml @@ -18,4 +18,4 @@ nodes: containerdConfigPatches: - |- [plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:{docker_registry_port}"] - endpoint = ["http://{docker_registry_name}:{docker_registry_port}"] \ No newline at end of file + endpoint = ["http://{docker_registry_name}:{docker_registry_port}"] diff --git a/projects/vdk-core/plugins/vdk-server/src/taurus/vdk/server_plugin.py b/projects/vdk-core/plugins/vdk-server/src/vdk/internal/server_plugin.py similarity index 81% rename from projects/vdk-core/plugins/vdk-server/src/taurus/vdk/server_plugin.py rename to projects/vdk-core/plugins/vdk-server/src/vdk/internal/server_plugin.py index 781d223803..7072c53d85 100644 --- a/projects/vdk-core/plugins/vdk-server/src/taurus/vdk/server_plugin.py +++ b/projects/vdk-core/plugins/vdk-server/src/vdk/internal/server_plugin.py @@ -7,8 +7,8 @@ import click from click import Context -from taurus.vdk.installer import Installer -from taurus.api.plugin.hook_markers import hookimpl +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.installer import Installer log = logging.getLogger(__name__) @@ -16,7 +16,7 @@ @click.command( name="server", help="Installs (and runs) or uninstalls a local Control Service." - """ + """ TODO: Add description """, ) @@ -35,7 +35,9 @@ def server(install, uninstall): if (not install and not uninstall) or (install and uninstall): - click.echo("Exactly one of --install or --uninstall options should be specified") + click.echo( + "Exactly one of --install or --uninstall options should be specified" + ) else: installer = Installer() if install: diff --git a/projects/vdk-core/plugins/vdk-snowflake/setup.py b/projects/vdk-core/plugins/vdk-snowflake/setup.py index a66b727910..90077c8ff1 100644 --- a/projects/vdk-core/plugins/vdk-snowflake/setup.py +++ b/projects/vdk-core/plugins/vdk-snowflake/setup.py @@ -16,7 +16,7 @@ install_requires=["vdk-core", "snowflake-connector-python"], package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), - entry_points={"vdk.plugin.run": ["vdk-snowflake = taurus.vdk.snowflake_plugin"]}, + entry_points={"vdk.plugin.run": ["vdk-snowflake = vdk.internal.snowflake_plugin"]}, classifiers=[ "Development Status :: 4 - Beta", "License :: OSI Approved :: Apache Software License", diff --git a/projects/vdk-core/plugins/vdk-snowflake/src/taurus/vdk/snowflake_connection.py b/projects/vdk-core/plugins/vdk-snowflake/src/vdk/internal/snowflake_connection.py similarity index 88% rename from projects/vdk-core/plugins/vdk-snowflake/src/taurus/vdk/snowflake_connection.py rename to projects/vdk-core/plugins/vdk-snowflake/src/vdk/internal/snowflake_connection.py index 392119f9b4..f90fcd0955 100644 --- a/projects/vdk-core/plugins/vdk-snowflake/src/taurus/vdk/snowflake_connection.py +++ b/projects/vdk-core/plugins/vdk-snowflake/src/vdk/internal/snowflake_connection.py @@ -1,19 +1,20 @@ +# Copyright 2021 VMware, Inc. +# SPDX-License-Identifier: Apache-2.0 import logging +from typing import Any +from typing import List -from typing import List, Any - -from taurus.vdk.builtin_plugins.connection.managed_connection_base import ( - ManagedConnectionBase, -) -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Connection +from snowflake.connector.errors import ProgrammingError from tenacity import before_sleep_log from tenacity import retry from tenacity import retry_if_exception_type from tenacity import stop_after_attempt from tenacity import wait_exponential - -from taurus.vdk.core import errors -from snowflake.connector.errors import ProgrammingError +from vdk.internal.builtin_plugins.connection.managed_connection_base import ( + ManagedConnectionBase, +) +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Connection +from vdk.internal.core import errors log = logging.getLogger(__name__) @@ -26,7 +27,7 @@ def __init__( password: str, warehouse: str, database: str, - schema: str + schema: str, ): """ Create a new snowflake connection. Connection parameters are: @@ -50,7 +51,7 @@ def __init__( log.debug( f"Creating new snowflake connection for user: {user} for account: {account}" ) - + def _connect(self) -> PEP249Connection: import snowflake.connector as sc @@ -62,9 +63,7 @@ def _connect(self) -> PEP249Connection: try: if not self._warehouse and not self._database and not self._schema: return sc.connect( - user=self._user, - password=self._password, - account=self._account + user=self._user, password=self._password, account=self._account ) else: return sc.connect( @@ -73,7 +72,7 @@ def _connect(self) -> PEP249Connection: account=self._account, warehouse=self._warehouse, database=self._database, - schema=self._schema + schema=self._schema, ) except (errors.BaseVdkError, ProgrammingError, Exception) as e: blamee = errors.ResolvableBy.CONFIG_ERROR @@ -86,7 +85,7 @@ def _connect(self) -> PEP249Connection: countermeasures=errors.MSG_COUNTERMEASURE_FIX_PARENT_EXCEPTION, exception=e, ) - + def execute_query(self, query) -> List[List[Any]]: try: return self.execute_query_with_retries(query) diff --git a/projects/vdk-core/plugins/vdk-snowflake/src/taurus/vdk/snowflake_plugin.py b/projects/vdk-core/plugins/vdk-snowflake/src/vdk/internal/snowflake_plugin.py similarity index 76% rename from projects/vdk-core/plugins/vdk-snowflake/src/taurus/vdk/snowflake_plugin.py rename to projects/vdk-core/plugins/vdk-snowflake/src/vdk/internal/snowflake_plugin.py index 6aa849d861..05a51d0c92 100644 --- a/projects/vdk-core/plugins/vdk-snowflake/src/taurus/vdk/snowflake_plugin.py +++ b/projects/vdk-core/plugins/vdk-snowflake/src/vdk/internal/snowflake_plugin.py @@ -1,19 +1,20 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -import pluggy -import click import logging from typing import Callable + +import click +import pluggy from snowflake.connector.errors import ProgrammingError -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Connection -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.statestore import ImmutableStoreKey -from taurus.vdk.snowflake_connection import SnowflakeConnection -from taurus.vdk.builtin_plugins.run.step import Step -from taurus.vdk.core.errors import UserCodeError +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Connection +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.builtin_plugins.run.step import Step +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.context import CoreContext +from vdk.internal.core.errors import UserCodeError +from vdk.internal.core.statestore import ImmutableStoreKey +from vdk.internal.snowflake_connection import SnowflakeConnection """ VDK-Snowflake Plugin @@ -35,10 +36,14 @@ def vdk_configure(config_builder: ConfigurationBuilder) -> None: key="SNOWFLAKE_SCHEMA", default_value=None, description="The database schema" ) config_builder.add( - key="SNOWFLAKE_WAREHOUSE", default_value=None, description="The warehouse to be used." + key="SNOWFLAKE_WAREHOUSE", + default_value=None, + description="The warehouse to be used.", ) config_builder.add( - key="SNOWFLAKE_DATABASE", default_value=None, description="The snowflake database to be used." + key="SNOWFLAKE_DATABASE", + default_value=None, + description="The snowflake database to be used.", ) config_builder.add( key="SNOWFLAKE_USER", default_value="unknown", description="User name" @@ -49,7 +54,9 @@ def vdk_configure(config_builder: ConfigurationBuilder) -> None: SnowflakeConnectionFunc = Callable[[], PEP249Connection] -CONNECTION_FUNC_KEY = ImmutableStoreKey[SnowflakeConnectionFunc]("snowflake-connection-method") +CONNECTION_FUNC_KEY = ImmutableStoreKey[SnowflakeConnectionFunc]( + "snowflake-connection-method" +) @hookimpl diff --git a/projects/vdk-core/plugins/vdk-snowflake/tests/test_snowflake_connection.py b/projects/vdk-core/plugins/vdk-snowflake/tests/test_snowflake_connection.py index df32c293db..31b29c8614 100644 --- a/projects/vdk-core/plugins/vdk-snowflake/tests/test_snowflake_connection.py +++ b/projects/vdk-core/plugins/vdk-snowflake/tests/test_snowflake_connection.py @@ -1,22 +1,22 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -import pytest from unittest.mock import patch -import snowflake -from taurus.vdk.core import errors -from taurus.vdk.snowflake_connection import SnowflakeConnection +import pytest +import snowflake +from vdk.internal.core import errors +from vdk.internal.snowflake_connection import SnowflakeConnection @pytest.fixture def mock_connect(monkeypatch): def mock_connection(*args, **kwargs): - if 'account' in kwargs: - if kwargs.get('account') != 'localhost': + if "account" in kwargs: + if kwargs.get("account") != "localhost": raise Exception("The account provided doesn't exist!") else: return True - + monkeypatch.setattr(snowflake.connector, "connect", mock_connection) @@ -28,6 +28,6 @@ def test_snowflake_connection_exception(mock_connect): password="testpassword", warehouse=None, database=None, - schema=None + schema=None, ) conn._connect() diff --git a/projects/vdk-core/plugins/vdk-sqlite/setup.py b/projects/vdk-core/plugins/vdk-sqlite/setup.py index fb09eac5c5..61ac706b0a 100644 --- a/projects/vdk-core/plugins/vdk-sqlite/setup.py +++ b/projects/vdk-core/plugins/vdk-sqlite/setup.py @@ -14,5 +14,5 @@ package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), include_package_data=True, - entry_points={"vdk.plugin.run": ["vdk-sqlite = taurus.vdk.sqlite_plugin"]}, + entry_points={"vdk.plugin.run": ["vdk-sqlite = vdk.internal.sqlite_plugin"]}, ) diff --git a/projects/vdk-core/plugins/vdk-sqlite/src/taurus/vdk/ingest_to_sqlite.py b/projects/vdk-core/plugins/vdk-sqlite/src/vdk/internal/ingest_to_sqlite.py similarity index 95% rename from projects/vdk-core/plugins/vdk-sqlite/src/taurus/vdk/ingest_to_sqlite.py rename to projects/vdk-core/plugins/vdk-sqlite/src/vdk/internal/ingest_to_sqlite.py index 67cf2b8a3a..915a9d4ba6 100644 --- a/projects/vdk-core/plugins/vdk-sqlite/src/taurus/vdk/ingest_to_sqlite.py +++ b/projects/vdk-core/plugins/vdk-sqlite/src/vdk/internal/ingest_to_sqlite.py @@ -7,10 +7,10 @@ from typing import List from typing import Optional -from taurus.vdk.builtin_plugins.ingestion.ingester_base import IIngesterPlugin -from taurus.vdk.core import errors -from taurus.vdk.sqlite_connection import SQLiteConfiguration -from taurus.vdk.sqlite_connection import SQLiteConnection +from vdk.internal.builtin_plugins.ingestion.ingester_base import IIngesterPlugin +from vdk.internal.core import errors +from vdk.internal.sqlite_connection import SQLiteConfiguration +from vdk.internal.sqlite_connection import SQLiteConnection log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-sqlite/src/taurus/vdk/sqlite_connection.py b/projects/vdk-core/plugins/vdk-sqlite/src/vdk/internal/sqlite_connection.py similarity index 91% rename from projects/vdk-core/plugins/vdk-sqlite/src/taurus/vdk/sqlite_connection.py rename to projects/vdk-core/plugins/vdk-sqlite/src/vdk/internal/sqlite_connection.py index 561c9d9bd9..328c66c38a 100644 --- a/projects/vdk-core/plugins/vdk-sqlite/src/taurus/vdk/sqlite_connection.py +++ b/projects/vdk-core/plugins/vdk-sqlite/src/vdk/internal/sqlite_connection.py @@ -5,8 +5,8 @@ import tempfile from typing import List -from taurus.vdk.core.config import Configuration -from taurus.vdk.util.decorators import closing_noexcept_on_close +from vdk.internal.core.config import Configuration +from vdk.internal.util.decorators import closing_noexcept_on_close SQLITE_FILE = "SQLITE_FILE" diff --git a/projects/vdk-core/plugins/vdk-sqlite/src/taurus/vdk/sqlite_plugin.py b/projects/vdk-core/plugins/vdk-sqlite/src/vdk/internal/sqlite_plugin.py similarity index 80% rename from projects/vdk-core/plugins/vdk-sqlite/src/taurus/vdk/sqlite_plugin.py rename to projects/vdk-core/plugins/vdk-sqlite/src/vdk/internal/sqlite_plugin.py index 58ff105c24..120d7be841 100644 --- a/projects/vdk-core/plugins/vdk-sqlite/src/taurus/vdk/sqlite_plugin.py +++ b/projects/vdk-core/plugins/vdk-sqlite/src/vdk/internal/sqlite_plugin.py @@ -7,13 +7,13 @@ import click from tabulate import tabulate -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.ingest_to_sqlite import IngestToSQLite -from taurus.vdk.sqlite_connection import SQLITE_FILE -from taurus.vdk.sqlite_connection import SQLiteConfiguration -from taurus.vdk.sqlite_connection import SQLiteConnection +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.ingest_to_sqlite import IngestToSQLite +from vdk.internal.sqlite_connection import SQLITE_FILE +from vdk.internal.sqlite_connection import SQLiteConfiguration +from vdk.internal.sqlite_connection import SQLiteConnection log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-sqlite/tests/test_sqlite_plugin.py b/projects/vdk-core/plugins/vdk-sqlite/tests/test_sqlite_plugin.py index ce3c63f536..c436ff2ff0 100644 --- a/projects/vdk-core/plugins/vdk-sqlite/tests/test_sqlite_plugin.py +++ b/projects/vdk-core/plugins/vdk-sqlite/tests/test_sqlite_plugin.py @@ -5,14 +5,14 @@ from click.testing import Result from pytest import raises -from taurus.vdk import sqlite_plugin -from taurus.vdk.core.errors import UserCodeError -from taurus.vdk.core.errors import VdkConfigurationError -from taurus.vdk.ingest_to_sqlite import IngestToSQLite -from taurus.vdk.sqlite_connection import SQLiteConfiguration -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_funcs import jobs_path_from_caller_directory +from vdk.internal import sqlite_plugin +from vdk.internal.core.errors import UserCodeError +from vdk.internal.core.errors import VdkConfigurationError +from vdk.internal.ingest_to_sqlite import IngestToSQLite +from vdk.internal.sqlite_connection import SQLiteConfiguration +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_funcs import jobs_path_from_caller_directory payload: dict = {"some_data": "some_test_data", "more_data": "more_test_data"} diff --git a/projects/vdk-core/plugins/vdk-test-utils/src/taurus/vdk/test_utils/util_funcs.py b/projects/vdk-core/plugins/vdk-test-utils/src/vdk/internal/test_utils/util_funcs.py similarity index 84% rename from projects/vdk-core/plugins/vdk-test-utils/src/taurus/vdk/test_utils/util_funcs.py rename to projects/vdk-core/plugins/vdk-test-utils/src/vdk/internal/test_utils/util_funcs.py index 00a75b9e72..2bd84b4b88 100644 --- a/projects/vdk-core/plugins/vdk-test-utils/src/taurus/vdk/test_utils/util_funcs.py +++ b/projects/vdk-core/plugins/vdk-test-utils/src/vdk/internal/test_utils/util_funcs.py @@ -9,22 +9,22 @@ import click from click.testing import CliRunner from click.testing import Result -from taurus.api.plugin.core_hook_spec import CoreHookSpecs -from taurus.api.plugin.core_hook_spec import JobRunHookSpecs -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk import cli_entry -from taurus.vdk.builtin_plugins.internal_hookspecs import InternalHookSpecs -from taurus.vdk.builtin_plugins.run.data_job import DataJob -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.builtin_plugins.run.step import Step -from taurus.vdk.builtin_plugins.run.step import StepBuilder -from taurus.vdk.builtin_plugins.run.step import StepFunction -from taurus.vdk.cli_entry import CliEntry -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.statestore import StateStore -from taurus.vdk.plugin.plugin import PluginRegistry -from taurus.vdk.test_utils.util_plugins import TestPropertiesPlugin +from vdk.api.plugin.core_hook_spec import CoreHookSpecs +from vdk.api.plugin.core_hook_spec import JobRunHookSpecs +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal import cli_entry +from vdk.internal.builtin_plugins.internal_hookspecs import InternalHookSpecs +from vdk.internal.builtin_plugins.run.data_job import DataJob +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.builtin_plugins.run.step import Step +from vdk.internal.builtin_plugins.run.step import StepBuilder +from vdk.internal.builtin_plugins.run.step import StepFunction +from vdk.internal.cli_entry import CliEntry +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.context import CoreContext +from vdk.internal.core.statestore import StateStore +from vdk.internal.plugin.plugin import PluginRegistry +from vdk.internal.test_utils.util_plugins import TestPropertiesPlugin def cli_assert(is_true, result: Result) -> None: diff --git a/projects/vdk-core/plugins/vdk-test-utils/src/taurus/vdk/test_utils/util_plugins.py b/projects/vdk-core/plugins/vdk-test-utils/src/vdk/internal/test_utils/util_plugins.py similarity index 89% rename from projects/vdk-core/plugins/vdk-test-utils/src/taurus/vdk/test_utils/util_plugins.py rename to projects/vdk-core/plugins/vdk-test-utils/src/vdk/internal/test_utils/util_plugins.py index 36f37fa4fd..2a3f5a9997 100644 --- a/projects/vdk-core/plugins/vdk-test-utils/src/taurus/vdk/test_utils/util_plugins.py +++ b/projects/vdk-core/plugins/vdk-test-utils/src/vdk/internal/test_utils/util_plugins.py @@ -10,16 +10,16 @@ from typing import List from typing import Optional -from taurus.api.plugin.hook_markers import hookimpl -from taurus.api.plugin.plugin_input import IIngesterPlugin -from taurus.api.plugin.plugin_input import IPropertiesServiceClient -from taurus.vdk.builtin_plugins.connection.managed_connection_base import ( +from vdk.api.plugin.hook_markers import hookimpl +from vdk.api.plugin.plugin_input import IIngesterPlugin +from vdk.api.plugin.plugin_input import IPropertiesServiceClient +from vdk.internal.builtin_plugins.connection.managed_connection_base import ( ManagedConnectionBase, ) -from taurus.vdk.builtin_plugins.connection.managed_cursor import ManagedCursor -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Connection -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.util.decorators import closing_noexcept_on_close +from vdk.internal.builtin_plugins.connection.managed_cursor import ManagedCursor +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Connection +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.util.decorators import closing_noexcept_on_close DB_TYPE_SQLITE_MEMORY = "SQLITE_MEMORY" diff --git a/projects/vdk-core/plugins/vdk-test-utils/tests/test_vdk_test_utils.py b/projects/vdk-core/plugins/vdk-test-utils/tests/test_vdk_test_utils.py index fe915f888a..20985fba82 100644 --- a/projects/vdk-core/plugins/vdk-test-utils/tests/test_vdk_test_utils.py +++ b/projects/vdk-core/plugins/vdk-test-utils/tests/test_vdk_test_utils.py @@ -1,7 +1,7 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.vdk.test_utils import util_funcs -from taurus.vdk.test_utils import util_plugins +from vdk.internal.test_utils import util_funcs +from vdk.internal.test_utils import util_plugins def test_vdk_test_utils(): diff --git a/projects/vdk-core/plugins/vdk-trino/MANIFEST.in b/projects/vdk-core/plugins/vdk-trino/MANIFEST.in index c33aa1c862..bd9918b58b 100644 --- a/projects/vdk-core/plugins/vdk-trino/MANIFEST.in +++ b/projects/vdk-core/plugins/vdk-trino/MANIFEST.in @@ -1,5 +1,5 @@ -include src/taurus/vdk/templates/load/dimension/**/* -include src/taurus/vdk/templates/load/fact/**/* +include src/vdk/internal/templates/load/dimension/**/* +include src/vdk/internal/templates/load/fact/**/* # this only work for source distribution (setup.py sdist) and not for binary distribution (bdist) # https://packaging.python.org/guides/using-manifest-in/ diff --git a/projects/vdk-core/plugins/vdk-trino/README.md b/projects/vdk-core/plugins/vdk-trino/README.md index d852506f27..59c1af0bc8 100644 --- a/projects/vdk-core/plugins/vdk-trino/README.md +++ b/projects/vdk-core/plugins/vdk-trino/README.md @@ -25,9 +25,9 @@ For example vdk-trino comes with pre-defined templates for SQL transformations * SCD1 - [Slowly Changing Dimension type 1](https://en.wikipedia.org/wiki/Slowly_changing_dimension#Type_1:_overwrite): - - [See usage documentation here](src/taurus/vdk/templates/load/dimension/scd1/README.md) + - [See usage documentation here](src/vdk/internal/templates/load/dimension/scd1/README.md) * SCD2 - [Slowly Changing Dimension Type 2](https://en.wikipedia.org/wiki/Slowly_changing_dimension#Type_2:_add_new_row): - - [See usage documentation here](src/taurus/vdk/templates/load/dimension/scd2/README.md) + - [See usage documentation here](src/vdk/internal/templates/load/dimension/scd2/README.md) ### Lineage @@ -43,7 +43,7 @@ They need to provide LineageLogger implementation and hook this way: ### Ingestion -This plugin allows users to [ingest](https://github.com/vmware/versatile-data-kit/blob/main/projects/vdk-core/src/taurus/api/job_input.py#L90) data to a Trino database, which can be preferable to inserting data manually as it automatically handles serializing, packaging and sending of the data asynchronously with configurable batching and throughput. To do so, you must set the expected variables to connect to Trino, plus the following environment variable: +This plugin allows users to [ingest](https://github.com/vmware/versatile-data-kit/blob/main/projects/vdk-core/src/vdk/api/job_input.py#L90) data to a Trino database, which can be preferable to inserting data manually as it automatically handles serializing, packaging and sending of the data asynchronously with configurable batching and throughput. To do so, you must set the expected variables to connect to Trino, plus the following environment variable: ```sh export VDK_INGEST_METHOD_DEFAULT=TRINO ``` diff --git a/projects/vdk-core/plugins/vdk-trino/setup.py b/projects/vdk-core/plugins/vdk-trino/setup.py index 5c0d16d4e2..22cebf1413 100644 --- a/projects/vdk-core/plugins/vdk-trino/setup.py +++ b/projects/vdk-core/plugins/vdk-trino/setup.py @@ -17,7 +17,7 @@ package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), include_package_data=True, - entry_points={"vdk.plugin.run": ["vdk-trino = taurus.vdk.trino_plugin"]}, + entry_points={"vdk.plugin.run": ["vdk-trino = vdk.internal.trino_plugin"]}, classifiers=[ "Development Status :: 4 - Beta", "License :: OSI Approved :: Apache Software License", diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/ingest_to_trino.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/ingest_to_trino.py similarity index 95% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/ingest_to_trino.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/ingest_to_trino.py index 617edc63a8..3c16d0ab7a 100644 --- a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/ingest_to_trino.py +++ b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/ingest_to_trino.py @@ -4,10 +4,10 @@ from typing import List from typing import Optional -from taurus.vdk.builtin_plugins.ingestion.ingester_base import IIngesterPlugin -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core import errors from trino.dbapi import Cursor +from vdk.internal.builtin_plugins.ingestion.ingester_base import IIngesterPlugin +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.core import errors log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/lineage.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/lineage.py similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/lineage.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/lineage.py diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/README.md b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/README.md similarity index 52% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/README.md rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/README.md index 0adc9027d3..3c1abeb117 100644 --- a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/README.md +++ b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/README.md @@ -1,2 +1,2 @@ ### Types of data loading templates -- Slowly Changing Dimension Type 1 - [see details and usage](projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/README.md) +- Slowly Changing Dimension Type 1 - [see details and usage](projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/README.md) diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/00-test-if-view-matches-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/00-test-if-view-matches-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/00-test-if-view-matches-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/00-test-if-view-matches-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/01-drop-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/01-drop-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/01-drop-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/01-drop-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/02-create-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/02-create-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/02-create-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/02-create-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/03-insert-into-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/03-insert-into-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/03-insert-into-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/03-insert-into-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/README.md b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/README.md similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd1/README.md rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd1/README.md diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/00-verify-valid-target.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/00-verify-valid-target.py similarity index 87% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/00-verify-valid-target.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/00-verify-valid-target.py index 8a06ce6121..d096de5dbd 100644 --- a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/00-verify-valid-target.py +++ b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/00-verify-valid-target.py @@ -2,9 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.api.job_input import IJobInput -from taurus.vdk.core import errors -from taurus.vdk.trino_utils import TrinoTemplateQueries +from vdk.api.job_input import IJobInput +from vdk.internal.core import errors +from vdk.internal.trino_utils import TrinoTemplateQueries log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/01-add-props-for-args.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/01-add-props-for-args.py similarity index 92% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/01-add-props-for-args.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/01-add-props-for-args.py index d6a574515d..818186fc5c 100644 --- a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/01-add-props-for-args.py +++ b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/01-add-props-for-args.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput): diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/02-test-if-view-matches-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/02-test-if-view-matches-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/02-test-if-view-matches-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/02-test-if-view-matches-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/03-drop-tmp-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/03-drop-tmp-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/03-drop-tmp-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/03-drop-tmp-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/04-drop-backup-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/04-drop-backup-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/04-drop-backup-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/04-drop-backup-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/05-create-tmp-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/05-create-tmp-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/05-create-tmp-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/05-create-tmp-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/06-insert-into-tmp-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/06-insert-into-tmp-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/06-insert-into-tmp-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/06-insert-into-tmp-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/07-move-data-from-tmp-to-target.py.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/07-move-data-from-tmp-to-target.py.py similarity index 89% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/07-move-data-from-tmp-to-target.py.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/07-move-data-from-tmp-to-target.py.py index 8d4ade6565..6fd19cc556 100644 --- a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/07-move-data-from-tmp-to-target.py.py +++ b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/07-move-data-from-tmp-to-target.py.py @@ -2,9 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.api.job_input import IJobInput -from taurus.vdk.core import errors -from taurus.vdk.trino_utils import TrinoTemplateQueries +from vdk.api.job_input import IJobInput +from vdk.internal.core import errors +from vdk.internal.trino_utils import TrinoTemplateQueries log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/README.md b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/README.md similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/dimension/scd2/README.md rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/dimension/scd2/README.md diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/00-verify-valid-target.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/00-verify-valid-target.py similarity index 87% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/00-verify-valid-target.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/00-verify-valid-target.py index 8a06ce6121..d096de5dbd 100644 --- a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/00-verify-valid-target.py +++ b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/00-verify-valid-target.py @@ -2,9 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.api.job_input import IJobInput -from taurus.vdk.core import errors -from taurus.vdk.trino_utils import TrinoTemplateQueries +from vdk.api.job_input import IJobInput +from vdk.internal.core import errors +from vdk.internal.trino_utils import TrinoTemplateQueries log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/01-test-if-view-matches-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/01-test-if-view-matches-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/01-test-if-view-matches-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/01-test-if-view-matches-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/02-drop-tmp-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/02-drop-tmp-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/02-drop-tmp-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/02-drop-tmp-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/03-drop-backup-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/03-drop-backup-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/03-drop-backup-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/03-drop-backup-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/04-create-tmp-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/04-create-tmp-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/04-create-tmp-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/04-create-tmp-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/05-insert-into-tmp-target.sql b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/05-insert-into-tmp-target.sql similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/05-insert-into-tmp-target.sql rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/05-insert-into-tmp-target.sql diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/06-move-data-from-tmp-to-target.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/06-move-data-from-tmp-to-target.py similarity index 93% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/06-move-data-from-tmp-to-target.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/06-move-data-from-tmp-to-target.py index 6a03245a1f..e1fcefeeef 100644 --- a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/06-move-data-from-tmp-to-target.py +++ b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/06-move-data-from-tmp-to-target.py @@ -2,9 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.api.job_input import IJobInput -from taurus.vdk.core import errors -from taurus.vdk.trino_utils import TrinoTemplateQueries +from vdk.api.job_input import IJobInput +from vdk.internal.core import errors +from vdk.internal.trino_utils import TrinoTemplateQueries log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/README.md b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/README.md similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/templates/load/fact/periodic_snapshot/README.md rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/templates/load/fact/periodic_snapshot/README.md diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_config.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_config.py similarity index 100% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_config.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_config.py diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_connection.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_connection.py similarity index 97% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_connection.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_connection.py index be82e6c4f5..22d0f40d9c 100644 --- a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_connection.py +++ b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_connection.py @@ -3,10 +3,6 @@ import logging import time -from taurus.vdk.builtin_plugins.connection.managed_connection_base import ( - ManagedConnectionBase, -) -from taurus.vdk.util.decorators import closing_noexcept_on_close from tenacity import before_sleep_log from tenacity import retry from tenacity import retry_if_exception_type @@ -14,6 +10,10 @@ from tenacity import wait_exponential from trino.exceptions import TrinoExternalError from trino.exceptions import TrinoInternalError +from vdk.internal.builtin_plugins.connection.managed_connection_base import ( + ManagedConnectionBase, +) +from vdk.internal.util.decorators import closing_noexcept_on_close log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_plugin.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_plugin.py similarity index 87% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_plugin.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_plugin.py index d5f399a4b7..b0e94b709b 100644 --- a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_plugin.py +++ b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_plugin.py @@ -9,20 +9,20 @@ import click import pluggy from tabulate import tabulate -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk import trino_config -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Connection -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.builtin_plugins.run.step import Step -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.errors import UserCodeError -from taurus.vdk.core.statestore import ImmutableStoreKey -from taurus.vdk.core.statestore import StoreKey -from taurus.vdk.ingest_to_trino import IngestToTrino -from taurus.vdk.lineage import LineageLogger -from taurus.vdk.trino_connection import TrinoConnection from trino.exceptions import TrinoUserError +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal import trino_config +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Connection +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.builtin_plugins.run.step import Step +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.context import CoreContext +from vdk.internal.core.errors import UserCodeError +from vdk.internal.core.statestore import ImmutableStoreKey +from vdk.internal.core.statestore import StoreKey +from vdk.internal.ingest_to_trino import IngestToTrino +from vdk.internal.lineage import LineageLogger +from vdk.internal.trino_connection import TrinoConnection log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_utils.py b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_utils.py similarity index 98% rename from projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_utils.py rename to projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_utils.py index b17948af1c..acbf0c1b87 100644 --- a/projects/vdk-core/plugins/vdk-trino/src/taurus/vdk/trino_utils.py +++ b/projects/vdk-core/plugins/vdk-trino/src/vdk/internal/trino_utils.py @@ -2,10 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.api.job_input import IJobInput -from taurus.vdk import trino_config -from taurus.vdk.core import errors from trino.exceptions import TrinoUserError +from vdk.api.job_input import IJobInput +from vdk.internal import trino_config +from vdk.internal.core import errors log = logging.getLogger(__name__) diff --git a/projects/vdk-core/plugins/vdk-trino/tests/conftest.py b/projects/vdk-core/plugins/vdk-trino/tests/conftest.py index 5cbdae6129..60e3d12bf4 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/conftest.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/conftest.py @@ -5,8 +5,8 @@ from unittest import mock import pytest -from taurus.vdk import trino_plugin -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal import trino_plugin +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner VDK_TRINO_HOST = "VDK_TRINO_HOST" VDK_DB_DEFAULT_TYPE = "VDK_DB_DEFAULT_TYPE" diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd1_template_job/01_prepare_input_data.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd1_template_job/01_prepare_input_data.py index 64d2fefe55..8a5bf3368b 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd1_template_job/01_prepare_input_data.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd1_template_job/01_prepare_input_data.py @@ -3,7 +3,7 @@ """ Load example input data for an scd1 template test. """ -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd1_template_job/02_run_load_dimension_scd1_template.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd1_template_job/02_run_load_dimension_scd1_template.py index 4b29e93ba1..d3bed07021 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd1_template_job/02_run_load_dimension_scd1_template.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd1_template_job/02_run_load_dimension_scd1_template.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd2_template_job/01_prepare_input_data.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd2_template_job/01_prepare_input_data.py index 4a192e2fb7..db6580edee 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd2_template_job/01_prepare_input_data.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd2_template_job/01_prepare_input_data.py @@ -3,8 +3,8 @@ """ Load example input data for an scd2 template test. """ -from taurus.api.job_input import IJobInput -from taurus.vdk.trino_utils import TrinoTemplateQueries +from vdk.api.job_input import IJobInput +from vdk.internal.trino_utils import TrinoTemplateQueries def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd2_template_job/02_run_load_dimension_scd2_template.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd2_template_job/02_run_load_dimension_scd2_template.py index f00655a37a..79d16fcd76 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd2_template_job/02_run_load_dimension_scd2_template.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_dimension_scd2_template_job/02_run_load_dimension_scd2_template.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job/01_prepare_input_data.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job/01_prepare_input_data.py index 6f266b7d05..7de0580850 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job/01_prepare_input_data.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job/01_prepare_input_data.py @@ -3,8 +3,8 @@ """ Load example input data for a periodic_snapshot template test. """ -from taurus.api.job_input import IJobInput -from taurus.vdk.trino_utils import TrinoTemplateQueries +from vdk.api.job_input import IJobInput +from vdk.internal.trino_utils import TrinoTemplateQueries def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job/02_run_load_fact_periodic_snapshot_template.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job/02_run_load_fact_periodic_snapshot_template.py index 2712c9cfaf..4702c8278d 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job/02_run_load_fact_periodic_snapshot_template.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job/02_run_load_fact_periodic_snapshot_template.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job_empty_source/01_prepare_input_data.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job_empty_source/01_prepare_input_data.py index e59a763894..0659e2e83e 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job_empty_source/01_prepare_input_data.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job_empty_source/01_prepare_input_data.py @@ -3,7 +3,7 @@ """ Load example input data for a periodic_snapshot template test with empty source. """ -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job_empty_source/02_run_load_fact_periodic_snapshot_template.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job_empty_source/02_run_load_fact_periodic_snapshot_template.py index 2712c9cfaf..4702c8278d 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job_empty_source/02_run_load_fact_periodic_snapshot_template.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/load_fact_periodic_snapshot_template_job_empty_source/02_run_load_fact_periodic_snapshot_template.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/01_prepare_input_data.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/01_prepare_input_data.py index 688044e2bc..144062e785 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/01_prepare_input_data.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/01_prepare_input_data.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/02_move_data_to_target.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/02_move_data_to_target.py index 54b09baf55..cecef2d8e6 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/02_move_data_to_target.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/02_move_data_to_target.py @@ -1,7 +1,7 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput -from taurus.vdk.trino_utils import TrinoTemplateQueries +from vdk.api.job_input import IJobInput +from vdk.internal.trino_utils import TrinoTemplateQueries def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/03_check_target.py b/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/03_check_target.py index df7b48a36f..ea8e740170 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/03_check_target.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/jobs/test_move_data_strategy_job/03_check_target.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput) -> None: diff --git a/projects/vdk-core/plugins/vdk-trino/tests/test_ingest_to_trino.py b/projects/vdk-core/plugins/vdk-trino/tests/test_ingest_to_trino.py index cca3a9f0f1..b41e68e0a2 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/test_ingest_to_trino.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/test_ingest_to_trino.py @@ -6,14 +6,14 @@ from unittest import TestCase import pytest -import taurus.vdk.core.errors -from taurus.vdk import trino_plugin -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core.errors import UserCodeError -from taurus.vdk.ingest_to_trino import IngestToTrino -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_funcs import get_test_job_path +import vdk.internal.core.errors +from vdk.internal import trino_plugin +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.core.errors import UserCodeError +from vdk.internal.ingest_to_trino import IngestToTrino +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_funcs import get_test_job_path VDK_DB_DEFAULT_TYPE = "VDK_DB_DEFAULT_TYPE" VDK_TRINO_PORT = "VDK_TRINO_PORT" diff --git a/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_templates.py b/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_templates.py index 07724fac97..4ad8794f58 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_templates.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_templates.py @@ -8,11 +8,11 @@ import pytest from click.testing import Result -from taurus.vdk import trino_plugin -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_funcs import get_test_job_path -from taurus.vdk.trino_utils import TrinoTemplateQueries +from vdk.internal import trino_plugin +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_funcs import get_test_job_path +from vdk.internal.trino_utils import TrinoTemplateQueries VDK_DB_DEFAULT_TYPE = "VDK_DB_DEFAULT_TYPE" VDK_TRINO_PORT = "VDK_TRINO_PORT" diff --git a/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_trino_lineage.py b/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_trino_lineage.py index 930f5cb1bc..1a749f909e 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_trino_lineage.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_trino_lineage.py @@ -6,11 +6,11 @@ import pytest from click.testing import Result -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk import trino_plugin -from taurus.vdk.lineage import LineageLogger -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.trino_plugin import LINEAGE_LOGGER_KEY +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal import trino_plugin +from vdk.internal.lineage import LineageLogger +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.trino_plugin import LINEAGE_LOGGER_KEY VDK_DB_DEFAULT_TYPE = "VDK_DB_DEFAULT_TYPE" VDK_TRINO_PORT = "VDK_TRINO_PORT" diff --git a/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_trino_utils.py b/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_trino_utils.py index c564679421..b23c392256 100644 --- a/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_trino_utils.py +++ b/projects/vdk-core/plugins/vdk-trino/tests/test_vdk_trino_utils.py @@ -8,11 +8,11 @@ import pytest from click.testing import Result -from taurus.vdk import trino_plugin -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_funcs import get_test_job_path -from taurus.vdk.trino_utils import TrinoTemplateQueries +from vdk.internal import trino_plugin +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_funcs import get_test_job_path +from vdk.internal.trino_utils import TrinoTemplateQueries VDK_DB_DEFAULT_TYPE = "VDK_DB_DEFAULT_TYPE" VDK_TRINO_PORT = "VDK_TRINO_PORT" diff --git a/projects/vdk-core/setup.cfg b/projects/vdk-core/setup.cfg index b0efcc3d47..d845f1d197 100644 --- a/projects/vdk-core/setup.cfg +++ b/projects/vdk-core/setup.cfg @@ -70,7 +70,7 @@ exclude = [options.entry_points] console_scripts = - vdk = taurus.vdk.cli_entry:main + vdk = vdk.internal.cli_entry:main [tool:pytest] # Options for py.test: diff --git a/projects/vdk-core/src/__main__.py b/projects/vdk-core/src/__main__.py index 68991cbfeb..5b458c5cb9 100644 --- a/projects/vdk-core/src/__main__.py +++ b/projects/vdk-core/src/__main__.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.vdk.cli_entry import main +from vdk.internal.cli_entry import main if __name__ == "__main__": main() diff --git a/projects/vdk-core/src/taurus/api/job_input.py b/projects/vdk-core/src/vdk/api/job_input.py similarity index 99% rename from projects/vdk-core/src/taurus/api/job_input.py rename to projects/vdk-core/src/vdk/api/job_input.py index 31b90db522..9a13f320f6 100644 --- a/projects/vdk-core/src/taurus/api/job_input.py +++ b/projects/vdk-core/src/vdk/api/job_input.py @@ -288,7 +288,7 @@ class ITemplate: Templates interface enables to package a whole data job and execute it as single operation. """ - from taurus.vdk.builtin_plugins.run.execution_results import ExecutionResult + from vdk.internal.builtin_plugins.run.execution_results import ExecutionResult @abstractmethod def execute_template( diff --git a/projects/vdk-core/src/taurus/api/plugin/core_hook_spec.py b/projects/vdk-core/src/vdk/api/plugin/core_hook_spec.py similarity index 91% rename from projects/vdk-core/src/taurus/api/plugin/core_hook_spec.py rename to projects/vdk-core/src/vdk/api/plugin/core_hook_spec.py index 9e3ef09f1a..d3a0bee383 100644 --- a/projects/vdk-core/src/taurus/api/plugin/core_hook_spec.py +++ b/projects/vdk-core/src/vdk/api/plugin/core_hook_spec.py @@ -4,10 +4,10 @@ from typing import Optional import click -from taurus.api.plugin.hook_markers import hookspec -from taurus.api.plugin.plugin_registry import IPluginRegistry -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.context import CoreContext +from vdk.api.plugin.hook_markers import hookspec +from vdk.api.plugin.plugin_registry import IPluginRegistry +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.context import CoreContext class CoreHookSpecs: @@ -60,7 +60,7 @@ def custom_command(...) # the hookimpl decorator should have its trylast parameter set to True, # so that all command plugins are loaded before defaults are set - from taurus.api.plugin.plugin_utils import set_defaults_for_specific_command, set_defaults_for_all_commands + from vdk.api.plugin.plugin_utils import set_defaults_for_specific_command, set_defaults_for_all_commands set_defaults_for_all_commands(root_command, {'team': 'team_name'}) set_defaults_for_specific_command(root_command, 'command_name', {'param1': '1', 'param2': '2'}) @@ -126,10 +126,10 @@ class JobRunHookSpecs: That's because a job template is executed as a normal data job. """ - from taurus.vdk.builtin_plugins.run.execution_results import ExecutionResult - from taurus.vdk.builtin_plugins.run.execution_results import StepResult - from taurus.vdk.builtin_plugins.run.job_context import JobContext - from taurus.vdk.builtin_plugins.run.step import Step + from vdk.internal.builtin_plugins.run.execution_results import ExecutionResult + from vdk.internal.builtin_plugins.run.execution_results import StepResult + from vdk.internal.builtin_plugins.run.job_context import JobContext + from vdk.internal.builtin_plugins.run.step import Step @hookspec def initialize_job(self, context: JobContext) -> None: diff --git a/projects/vdk-core/src/taurus/api/plugin/hook_markers.py b/projects/vdk-core/src/vdk/api/plugin/hook_markers.py similarity index 100% rename from projects/vdk-core/src/taurus/api/plugin/hook_markers.py rename to projects/vdk-core/src/vdk/api/plugin/hook_markers.py diff --git a/projects/vdk-core/src/taurus/api/plugin/plugin_input.py b/projects/vdk-core/src/vdk/api/plugin/plugin_input.py similarity index 99% rename from projects/vdk-core/src/taurus/api/plugin/plugin_input.py rename to projects/vdk-core/src/vdk/api/plugin/plugin_input.py index cb157727f5..d03c8177e7 100644 --- a/projects/vdk-core/src/taurus/api/plugin/plugin_input.py +++ b/projects/vdk-core/src/vdk/api/plugin/plugin_input.py @@ -11,7 +11,7 @@ from typing import Optional from typing import Union -from taurus.vdk.builtin_plugins.connection.managed_connection_base import ( +from vdk.internal.builtin_plugins.connection.managed_connection_base import ( ManagedConnectionBase, ) diff --git a/projects/vdk-core/src/taurus/api/plugin/plugin_registry.py b/projects/vdk-core/src/vdk/api/plugin/plugin_registry.py similarity index 100% rename from projects/vdk-core/src/taurus/api/plugin/plugin_registry.py rename to projects/vdk-core/src/vdk/api/plugin/plugin_registry.py diff --git a/projects/vdk-core/src/taurus/api/plugin/plugin_utils.py b/projects/vdk-core/src/vdk/api/plugin/plugin_utils.py similarity index 99% rename from projects/vdk-core/src/taurus/api/plugin/plugin_utils.py rename to projects/vdk-core/src/vdk/api/plugin/plugin_utils.py index f76a051f56..bab18ce0d6 100644 --- a/projects/vdk-core/src/taurus/api/plugin/plugin_utils.py +++ b/projects/vdk-core/src/vdk/api/plugin/plugin_utils.py @@ -4,7 +4,7 @@ from typing import Dict import click -from taurus.vdk.core import errors +from vdk.internal.core import errors log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/builtin_hook_impl.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/builtin_hook_impl.py similarity index 72% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/builtin_hook_impl.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/builtin_hook_impl.py index 6d77d7c89b..2bd2cadab8 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/builtin_hook_impl.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/builtin_hook_impl.py @@ -7,29 +7,29 @@ from typing import List import click -from taurus.api.plugin.core_hook_spec import JobRunHookSpecs -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk import vdk_build_info -from taurus.vdk.builtin_plugins.config.config_help import ConfigHelpPlugin -from taurus.vdk.builtin_plugins.config.log_config import LoggingPlugin -from taurus.vdk.builtin_plugins.config.vdk_config import CoreConfigDefinitionPlugin -from taurus.vdk.builtin_plugins.config.vdk_config import EnvironmentVarsConfigPlugin -from taurus.vdk.builtin_plugins.config.vdk_config import JobConfigIniPlugin -from taurus.vdk.builtin_plugins.debug.debug import DebugPlugins -from taurus.vdk.builtin_plugins.ingestion.ingester_configuration_plugin import ( +from vdk.api.plugin.core_hook_spec import JobRunHookSpecs +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal import vdk_build_info +from vdk.internal.builtin_plugins.config.config_help import ConfigHelpPlugin +from vdk.internal.builtin_plugins.config.log_config import LoggingPlugin +from vdk.internal.builtin_plugins.config.vdk_config import CoreConfigDefinitionPlugin +from vdk.internal.builtin_plugins.config.vdk_config import EnvironmentVarsConfigPlugin +from vdk.internal.builtin_plugins.config.vdk_config import JobConfigIniPlugin +from vdk.internal.builtin_plugins.debug.debug import DebugPlugins +from vdk.internal.builtin_plugins.ingestion.ingester_configuration_plugin import ( IngesterConfigurationPlugin, ) -from taurus.vdk.builtin_plugins.job_properties.properties_api_plugin import ( +from vdk.internal.builtin_plugins.job_properties.properties_api_plugin import ( PropertiesApiPlugin, ) -from taurus.vdk.builtin_plugins.notification.notification import NotificationPlugin -from taurus.vdk.builtin_plugins.version.new_version_check_plugin import ( +from vdk.internal.builtin_plugins.notification.notification import NotificationPlugin +from vdk.internal.builtin_plugins.version.new_version_check_plugin import ( NewVersionCheckPlugin, ) -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.statestore import CommonStoreKeys -from taurus.vdk.plugin.plugin import PluginRegistry +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.context import CoreContext +from vdk.internal.core.statestore import CommonStoreKeys +from vdk.internal.plugin.plugin import PluginRegistry log = logging.getLogger(__name__) @@ -107,8 +107,8 @@ def vdk_command_line(root_command: click.Group) -> None: """ Register commands """ - from taurus.vdk.builtin_plugins.run.cli_run import run - from taurus.vdk.builtin_plugins.version.version import version + from vdk.internal.builtin_plugins.run.cli_run import run + from vdk.internal.builtin_plugins.version.version import version root_command.add_command(run) root_command.add_command(version) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/config/config_help.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/config/config_help.py similarity index 97% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/config/config_help.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/config/config_help.py index 92a76a3921..1e32a10cef 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/config/config_help.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/config/config_help.py @@ -6,8 +6,8 @@ from typing import cast import click -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.core.context import CoreContext +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.core.context import CoreContext log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/config/job_config.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/config/job_config.py similarity index 97% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/config/job_config.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/config/job_config.py index 5720ae26e6..71affabfd3 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/config/job_config.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/config/job_config.py @@ -5,7 +5,7 @@ from enum import Enum from typing import List -from taurus.vdk.core.config import convert_value_to_type_of_default_type +from vdk.internal.core.config import convert_value_to_type_of_default_type class JobConfigKeys(str, Enum): diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/config/log_config.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/config/log_config.py similarity index 95% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/config/log_config.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/config/log_config.py index 209ebb8d83..84b8a57acd 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/config/log_config.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/config/log_config.py @@ -5,11 +5,11 @@ from sys import modules from typing import cast -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.config import vdk_config -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core import errors -from taurus.vdk.core.statestore import CommonStoreKeys +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.config import vdk_config +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.core import errors +from vdk.internal.core.statestore import CommonStoreKeys def configure_loggers( diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/config/vdk_config.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/config/vdk_config.py similarity index 96% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/config/vdk_config.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/config/vdk_config.py index adf2986964..d700ff68a5 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/config/vdk_config.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/config/vdk_config.py @@ -5,10 +5,10 @@ from os import getenv from typing import Optional -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.config.job_config import JobConfig -from taurus.vdk.builtin_plugins.config.job_config import JobConfigKeys -from taurus.vdk.core.config import ConfigurationBuilder +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.config.job_config import JobConfig +from vdk.internal.builtin_plugins.config.job_config import JobConfigKeys +from vdk.internal.core.config import ConfigurationBuilder VDK_ = "VDK_" diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/impl/router.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/connection/impl/router.py similarity index 90% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/impl/router.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/connection/impl/router.py index b58d7554c0..c179639fdb 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/impl/router.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/connection/impl/router.py @@ -5,17 +5,17 @@ from typing import Dict from typing import Union -from taurus.api.plugin.plugin_input import IManagedConnectionRegistry -from taurus.vdk.builtin_plugins.config.vdk_config import DB_DEFAULT_TYPE -from taurus.vdk.builtin_plugins.connection.impl.wrapped_connection import ( +from vdk.api.plugin.plugin_input import IManagedConnectionRegistry +from vdk.internal.builtin_plugins.config.vdk_config import DB_DEFAULT_TYPE +from vdk.internal.builtin_plugins.connection.impl.wrapped_connection import ( WrappedConnection, ) -from taurus.vdk.builtin_plugins.connection.managed_connection_base import ( +from vdk.internal.builtin_plugins.connection.managed_connection_base import ( ManagedConnectionBase, ) -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Connection -from taurus.vdk.core import errors -from taurus.vdk.core.config import Configuration +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Connection +from vdk.internal.core import errors +from vdk.internal.core.config import Configuration class ManagedConnectionRouter(IManagedConnectionRegistry): diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/impl/wrapped_connection.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/connection/impl/wrapped_connection.py similarity index 85% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/impl/wrapped_connection.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/connection/impl/wrapped_connection.py index 053d9bbd6b..19d8945ad8 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/impl/wrapped_connection.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/connection/impl/wrapped_connection.py @@ -4,11 +4,11 @@ from typing import Any from typing import Callable -from taurus.vdk.builtin_plugins.connection.managed_connection_base import ( +from vdk.internal.builtin_plugins.connection.managed_connection_base import ( ManagedConnectionBase, ) -from taurus.vdk.builtin_plugins.connection.managed_cursor import ManagedCursor -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Connection +from vdk.internal.builtin_plugins.connection.managed_cursor import ManagedCursor +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Connection class WrappedConnection(ManagedConnectionBase): diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/managed_connection_base.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/connection/managed_connection_base.py similarity index 96% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/managed_connection_base.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/connection/managed_connection_base.py index d020c7949f..2cf286a6fa 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/managed_connection_base.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/connection/managed_connection_base.py @@ -9,16 +9,16 @@ from typing import Optional from typing import Type -from taurus.api.job_input import IManagedConnection -from taurus.vdk.builtin_plugins.connection.managed_cursor import ManagedCursor -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Connection -from taurus.vdk.core import errors -from taurus.vdk.util.decorators import closing_noexcept_on_close from tenacity import before_sleep_log from tenacity import retry from tenacity import retry_if_exception_type from tenacity import stop_after_attempt from tenacity import wait_exponential +from vdk.api.job_input import IManagedConnection +from vdk.internal.builtin_plugins.connection.managed_cursor import ManagedCursor +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Connection +from vdk.internal.core import errors +from vdk.internal.util.decorators import closing_noexcept_on_close logger = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/managed_cursor.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/connection/managed_cursor.py similarity index 95% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/managed_cursor.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/connection/managed_cursor.py index d98678d751..02d451768d 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/managed_cursor.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/connection/managed_cursor.py @@ -8,7 +8,7 @@ from typing import Tuple from typing import Union -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Cursor +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Cursor class ManagedCursor(PEP249Cursor): diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/pep249/interfaces.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/connection/pep249/interfaces.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/connection/pep249/interfaces.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/connection/pep249/interfaces.py diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/debug/debug.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/debug/debug.py similarity index 93% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/debug/debug.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/debug/debug.py index 1fed2c5a95..b1eb5ab83e 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/debug/debug.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/debug/debug.py @@ -11,11 +11,11 @@ from typing import Optional import click -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.statestore import StoreKey -from taurus.vdk.plugin.plugin import PluginRegistry +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.core.context import CoreContext +from vdk.internal.core.statestore import StoreKey +from vdk.internal.plugin.plugin import PluginRegistry log = logging.getLogger(__name__) @@ -99,8 +99,8 @@ def hello(ctx: click.Context) -> None: import json def _default_handler(o: Any) -> Any: - from taurus.vdk.core.context import CoreContext - from taurus.vdk.core.config import Configuration + from vdk.internal.core.context import CoreContext + from vdk.internal.core.config import Configuration if ( isinstance(o, click.core.Context) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_base.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_base.py similarity index 97% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_base.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_base.py index 5455b1889a..51e783d78f 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_base.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_base.py @@ -9,18 +9,18 @@ from typing import Iterable from typing import Optional -from taurus.api.job_input import IIngester -from taurus.api.plugin.plugin_input import IIngesterPlugin -from taurus.vdk.builtin_plugins.ingestion import ingester_utils -from taurus.vdk.builtin_plugins.ingestion.ingester_configuration import ( +from vdk.api.job_input import IIngester +from vdk.api.plugin.plugin_input import IIngesterPlugin +from vdk.internal.builtin_plugins.ingestion import ingester_utils +from vdk.internal.builtin_plugins.ingestion.ingester_configuration import ( IngesterConfiguration, ) -from taurus.vdk.builtin_plugins.ingestion.ingester_utils import AtomicCounter -from taurus.vdk.core import errors -from taurus.vdk.core.errors import PlatformServiceError -from taurus.vdk.core.errors import ResolvableBy -from taurus.vdk.core.errors import UserCodeError -from taurus.vdk.core.errors import VdkConfigurationError +from vdk.internal.builtin_plugins.ingestion.ingester_utils import AtomicCounter +from vdk.internal.core import errors +from vdk.internal.core.errors import PlatformServiceError +from vdk.internal.core.errors import ResolvableBy +from vdk.internal.core.errors import UserCodeError +from vdk.internal.core.errors import VdkConfigurationError log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_configuration.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_configuration.py similarity index 97% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_configuration.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_configuration.py index 0536f829b5..d13552f15f 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_configuration.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_configuration.py @@ -1,7 +1,7 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.config import ConfigurationBuilder +from vdk.internal.core.config import Configuration +from vdk.internal.core.config import ConfigurationBuilder INGESTER_NUMBER_OF_WORKER_THREADS = "INGESTER_NUMBER_OF_WORKER_THREADS" INGESTER_PAYLOAD_SIZE_BYTES_THRESHOLD = "INGESTER_PAYLOAD_SIZE_BYTES_THRESHOLD" diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_configuration_plugin.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_configuration_plugin.py similarity index 82% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_configuration_plugin.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_configuration_plugin.py index 16a620dcb5..0e5836a11a 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_configuration_plugin.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_configuration_plugin.py @@ -1,9 +1,9 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.ingestion import ingester_configuration -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.core.config import ConfigurationBuilder +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.ingestion import ingester_configuration +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.core.config import ConfigurationBuilder class IngesterConfigurationPlugin: diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_router.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_router.py similarity index 92% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_router.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_router.py index fd08687ea7..80adcdbf6c 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_router.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_router.py @@ -5,22 +5,22 @@ from typing import Dict from typing import Optional -from taurus.api.plugin.plugin_input import IIngesterPlugin -from taurus.api.plugin.plugin_input import IIngesterRegistry -from taurus.vdk.builtin_plugins.ingestion.ingester_base import IngesterBase -from taurus.vdk.builtin_plugins.ingestion.ingester_configuration import ( +from vdk.api.plugin.plugin_input import IIngesterPlugin +from vdk.api.plugin.plugin_input import IIngesterRegistry +from vdk.internal.builtin_plugins.ingestion.ingester_base import IngesterBase +from vdk.internal.builtin_plugins.ingestion.ingester_configuration import ( IngesterConfiguration, ) -from taurus.vdk.builtin_plugins.run.execution_state import ExecutionStateStoreKeys -from taurus.vdk.core import errors -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.errors import ErrorMessage -from taurus.vdk.core.errors import PlatformServiceError -from taurus.vdk.core.errors import ResolvableBy -from taurus.vdk.core.errors import UserCodeError -from taurus.vdk.core.errors import VdkConfigurationError -from taurus.vdk.core.statestore import CommonStoreKeys -from taurus.vdk.core.statestore import StateStore +from vdk.internal.builtin_plugins.run.execution_state import ExecutionStateStoreKeys +from vdk.internal.core import errors +from vdk.internal.core.config import Configuration +from vdk.internal.core.errors import ErrorMessage +from vdk.internal.core.errors import PlatformServiceError +from vdk.internal.core.errors import ResolvableBy +from vdk.internal.core.errors import UserCodeError +from vdk.internal.core.errors import VdkConfigurationError +from vdk.internal.core.statestore import CommonStoreKeys +from vdk.internal.core.statestore import StateStore IngesterPluginFactory = Callable[[], IIngesterPlugin] diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_utils.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_utils.py similarity index 99% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_utils.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_utils.py index affe968cc6..1991742185 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/ingestion/ingester_utils.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/ingestion/ingester_utils.py @@ -12,7 +12,7 @@ from typing import Any from typing import List -from taurus.vdk.core import errors +from vdk.internal.core import errors log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/internal_hookspecs.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/internal_hookspecs.py similarity index 91% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/internal_hookspecs.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/internal_hookspecs.py index 4832c67e69..77623933b0 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/internal_hookspecs.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/internal_hookspecs.py @@ -3,9 +3,9 @@ from typing import List import click -from taurus.api.plugin.hook_markers import hookspec -from taurus.api.plugin.plugin_registry import IPluginRegistry -from taurus.vdk.core.context import CoreContext +from vdk.api.plugin.hook_markers import hookspec +from vdk.api.plugin.plugin_registry import IPluginRegistry +from vdk.internal.core.context import CoreContext class InternalHookSpecs: diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/Propertiesnotavailable.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/Propertiesnotavailable.py similarity index 94% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/Propertiesnotavailable.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/Propertiesnotavailable.py index 833ff2c136..f3d71231f9 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/Propertiesnotavailable.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/Propertiesnotavailable.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 from typing import Callable -from taurus.api.job_input import IProperties +from vdk.api.job_input import IProperties class PropertiesNotAvailable(IProperties): diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/base_properties_impl.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/base_properties_impl.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/base_properties_impl.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/base_properties_impl.py diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/cached_properties.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/cached_properties.py similarity index 96% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/cached_properties.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/cached_properties.py index 41422291b4..fce2b19b89 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/cached_properties.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/cached_properties.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IProperties +from vdk.api.job_input import IProperties class CachedPropertiesWrapper(IProperties): diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/datajobs_service_properties.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/datajobs_service_properties.py similarity index 94% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/datajobs_service_properties.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/datajobs_service_properties.py index 0047e43859..9915b52a9e 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/datajobs_service_properties.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/datajobs_service_properties.py @@ -4,8 +4,8 @@ from typing import Dict from typing import Union -from taurus.api.job_input import IProperties -from taurus.api.plugin.plugin_input import IPropertiesServiceClient +from vdk.api.job_input import IProperties +from vdk.api.plugin.plugin_input import IPropertiesServiceClient from .base_properties_impl import check_valid_property diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/inmemproperties.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/inmemproperties.py similarity index 89% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/inmemproperties.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/inmemproperties.py index 2b965681c3..8028f0e2bf 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/inmemproperties.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/inmemproperties.py @@ -4,7 +4,7 @@ from copy import deepcopy from typing import Dict -from taurus.api.plugin.plugin_input import IPropertiesServiceClient +from vdk.api.plugin.plugin_input import IPropertiesServiceClient log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/properties_api_plugin.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/properties_api_plugin.py similarity index 65% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/properties_api_plugin.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/properties_api_plugin.py index 1bc8e146a5..ac8ebe8d14 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/properties_api_plugin.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/properties_api_plugin.py @@ -1,8 +1,8 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.job_properties import properties_config -from taurus.vdk.core.config import ConfigurationBuilder +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.job_properties import properties_config +from vdk.internal.core.config import ConfigurationBuilder class PropertiesApiPlugin: diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/properties_config.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/properties_config.py similarity index 88% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/properties_config.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/properties_config.py index e26f112179..c0364db238 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/properties_config.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/properties_config.py @@ -1,7 +1,7 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.config import ConfigurationBuilder +from vdk.internal.core.config import Configuration +from vdk.internal.core.config import ConfigurationBuilder PROPERTIES_DEFAULT_TYPE = "PROPERTIES_DEFAULT_TYPE" diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/properties_router.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/properties_router.py similarity index 89% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/properties_router.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/properties_router.py index 06025e8203..1acbc924ec 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/job_properties/properties_router.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/job_properties/properties_router.py @@ -2,23 +2,23 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from taurus.api.plugin.plugin_input import IPropertiesFactory -from taurus.api.plugin.plugin_input import IPropertiesRegistry -from taurus.vdk.builtin_plugins.job_properties.cached_properties import ( +from vdk.api.plugin.plugin_input import IPropertiesFactory +from vdk.api.plugin.plugin_input import IPropertiesRegistry +from vdk.internal.builtin_plugins.job_properties.cached_properties import ( CachedPropertiesWrapper, ) -from taurus.vdk.builtin_plugins.job_properties.datajobs_service_properties import ( +from vdk.internal.builtin_plugins.job_properties.datajobs_service_properties import ( DataJobsServiceProperties, ) -from taurus.vdk.builtin_plugins.job_properties.properties_config import ( +from vdk.internal.builtin_plugins.job_properties.properties_config import ( PropertiesConfiguration, ) -from taurus.vdk.builtin_plugins.job_properties.Propertiesnotavailable import ( +from vdk.internal.builtin_plugins.job_properties.Propertiesnotavailable import ( PropertiesNotAvailable, ) -from taurus.vdk.core import errors -from taurus.vdk.core.config import Configuration -from taurus.vdk.util.decorators import LogDecorator +from vdk.internal.core import errors +from vdk.internal.core.config import Configuration +from vdk.internal.util.decorators import LogDecorator log: logging.Logger = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/notification/notification.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/notification/notification.py similarity index 82% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/notification/notification.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/notification/notification.py index 21fefe6912..cfc59cbf97 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/notification/notification.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/notification/notification.py @@ -3,22 +3,22 @@ import logging from typing import List -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.config.job_config import JobConfigKeys -from taurus.vdk.builtin_plugins.config.vdk_config import LOG_CONFIG -from taurus.vdk.builtin_plugins.notification import notification_base -from taurus.vdk.builtin_plugins.notification import notification_configuration -from taurus.vdk.builtin_plugins.notification.notification_configuration import ( +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.config.job_config import JobConfigKeys +from vdk.internal.builtin_plugins.config.vdk_config import LOG_CONFIG +from vdk.internal.builtin_plugins.notification import notification_base +from vdk.internal.builtin_plugins.notification import notification_configuration +from vdk.internal.builtin_plugins.notification.notification_configuration import ( NotificationConfiguration, ) -from taurus.vdk.builtin_plugins.notification.notification_configuration import ( +from vdk.internal.builtin_plugins.notification.notification_configuration import ( SmtpConfiguration, ) -from taurus.vdk.builtin_plugins.run.execution_state import ExecutionStateStoreKeys -from taurus.vdk.core import errors -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.statestore import CommonStoreKeys +from vdk.internal.builtin_plugins.run.execution_state import ExecutionStateStoreKeys +from vdk.internal.core import errors +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.context import CoreContext +from vdk.internal.core.statestore import CommonStoreKeys log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/notification/notification_base.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/notification/notification_base.py similarity index 98% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/notification/notification_base.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/notification/notification_base.py index 869f6db0e6..72deb9b185 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/notification/notification_base.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/notification/notification_base.py @@ -9,10 +9,10 @@ from functools import reduce from typing import List -from taurus.vdk.builtin_plugins.notification.notification_configuration import ( +from vdk.internal.builtin_plugins.notification.notification_configuration import ( SmtpConfiguration, ) -from taurus.vdk.core import errors +from vdk.internal.core import errors log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/notification/notification_configuration.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/notification/notification_configuration.py similarity index 97% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/notification/notification_configuration.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/notification/notification_configuration.py index b49ef5771b..fdc91f9cf1 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/notification/notification_configuration.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/notification/notification_configuration.py @@ -2,9 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 from typing import List -from taurus.vdk.builtin_plugins.config.job_config import JobConfigKeys -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.config import ConfigurationBuilder +from vdk.internal.builtin_plugins.config.job_config import JobConfigKeys +from vdk.internal.core.config import Configuration +from vdk.internal.core.config import ConfigurationBuilder NOTIFICATION_ENABLED = "NOTIFICATION_ENABLED" NOTIFICATION_JOB_LOG_URL_PATTERN = "NOTIFICATION_JOB_LOG_URL_PATTERN" diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/cli_run.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/cli_run.py similarity index 88% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/cli_run.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/cli_run.py index 107893e900..aed99e7395 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/cli_run.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/cli_run.py @@ -9,16 +9,16 @@ from typing import Optional import click -from taurus.vdk.builtin_plugins.run import job_input_error_classifier -from taurus.vdk.builtin_plugins.run.data_job import DataJob -from taurus.vdk.builtin_plugins.run.data_job import DataJobDefaultHookImplPlugin -from taurus.vdk.builtin_plugins.run.data_job import DataJobFactory -from taurus.vdk.builtin_plugins.run.execution_tracking import ( +from vdk.internal.builtin_plugins.run import job_input_error_classifier +from vdk.internal.builtin_plugins.run.data_job import DataJob +from vdk.internal.builtin_plugins.run.data_job import DataJobDefaultHookImplPlugin +from vdk.internal.builtin_plugins.run.data_job import DataJobFactory +from vdk.internal.builtin_plugins.run.execution_tracking import ( ExecutionTrackingPlugin, ) -from taurus.vdk.builtin_plugins.version import version -from taurus.vdk.core import errors -from taurus.vdk.core.context import CoreContext +from vdk.internal.builtin_plugins.version import version +from vdk.internal.core import errors +from vdk.internal.core.context import CoreContext log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/data_job.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/data_job.py similarity index 89% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/data_job.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/data_job.py index f8b68cd77e..e30e99a6b3 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/data_job.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/data_job.py @@ -8,21 +8,21 @@ from typing import Dict from typing import Optional -from taurus.api.job_input import IJobArguments -from taurus.api.plugin.core_hook_spec import JobRunHookSpecs -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.run.execution_results import ExecutionResult -from taurus.vdk.builtin_plugins.run.execution_results import StepResult -from taurus.vdk.builtin_plugins.run.file_based_step import JobFilesLocator -from taurus.vdk.builtin_plugins.run.file_based_step import StepFuncFactory -from taurus.vdk.builtin_plugins.run.file_based_step import TYPE_PYTHON -from taurus.vdk.builtin_plugins.run.file_based_step import TYPE_SQL -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.builtin_plugins.run.run_status import ExecutionStatus -from taurus.vdk.builtin_plugins.run.step import Step -from taurus.vdk.core import errors -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.statestore import CommonStoreKeys +from vdk.api.job_input import IJobArguments +from vdk.api.plugin.core_hook_spec import JobRunHookSpecs +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.run.execution_results import ExecutionResult +from vdk.internal.builtin_plugins.run.execution_results import StepResult +from vdk.internal.builtin_plugins.run.file_based_step import JobFilesLocator +from vdk.internal.builtin_plugins.run.file_based_step import StepFuncFactory +from vdk.internal.builtin_plugins.run.file_based_step import TYPE_PYTHON +from vdk.internal.builtin_plugins.run.file_based_step import TYPE_SQL +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.builtin_plugins.run.run_status import ExecutionStatus +from vdk.internal.builtin_plugins.run.step import Step +from vdk.internal.core import errors +from vdk.internal.core.context import CoreContext +from vdk.internal.core.statestore import CommonStoreKeys log = logging.getLogger(__name__) @@ -235,7 +235,7 @@ def run(self, args: Dict = None) -> ExecutionResult: DataJobDefaultHookImplPlugin(), DataJobDefaultHookImplPlugin.__name__ ) - from taurus.vdk.builtin_plugins.templates.template_impl import TemplatesImpl + from vdk.internal.builtin_plugins.templates.template_impl import TemplatesImpl job_context = JobContext( name=self._name, diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_environment.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_environment.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_environment.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_environment.py diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_results.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_results.py similarity index 97% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_results.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_results.py index eb5319cc83..d040a1b946 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_results.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_results.py @@ -7,7 +7,7 @@ from typing import List from typing import Optional -from taurus.vdk.builtin_plugins.run.run_status import ExecutionStatus +from vdk.internal.builtin_plugins.run.run_status import ExecutionStatus @dataclass(frozen=True) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_state.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_state.py similarity index 84% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_state.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_state.py index 376d97443c..897fb7836c 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_state.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_state.py @@ -3,8 +3,8 @@ from typing import List from typing import Optional -from taurus.vdk.builtin_plugins.run.execution_results import ExecutionResult -from taurus.vdk.core.statestore import StoreKey +from vdk.internal.builtin_plugins.run.execution_results import ExecutionResult +from vdk.internal.core.statestore import StoreKey class ExecutionStateStoreKeys: diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_tracking.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_tracking.py similarity index 79% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_tracking.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_tracking.py index c68edc12f1..33795f1601 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/execution_tracking.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/execution_tracking.py @@ -1,14 +1,14 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 import pluggy -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.config import vdk_config -from taurus.vdk.builtin_plugins.run.execution_results import ExecutionResult -from taurus.vdk.builtin_plugins.run.execution_results import StepResult -from taurus.vdk.builtin_plugins.run.execution_state import ExecutionStateStoreKeys -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.builtin_plugins.run.run_status import ExecutionStatus -from taurus.vdk.builtin_plugins.run.step import Step +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.config import vdk_config +from vdk.internal.builtin_plugins.run.execution_results import ExecutionResult +from vdk.internal.builtin_plugins.run.execution_results import StepResult +from vdk.internal.builtin_plugins.run.execution_state import ExecutionStateStoreKeys +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.builtin_plugins.run.run_status import ExecutionStatus +from vdk.internal.builtin_plugins.run.step import Step class ExecutionTrackingPlugin: diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/file_based_step.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/file_based_step.py similarity index 97% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/file_based_step.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/file_based_step.py index 2898102373..c8a07bfa9d 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/file_based_step.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/file_based_step.py @@ -8,9 +8,9 @@ from typing import Callable from typing import List -from taurus.api.job_input import IJobInput -from taurus.vdk.builtin_plugins.run.step import Step -from taurus.vdk.core import errors +from vdk.api.job_input import IJobInput +from vdk.internal.builtin_plugins.run.step import Step +from vdk.internal.core import errors log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/job_context.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/job_context.py similarity index 77% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/job_context.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/job_context.py index 9d6e600b81..dc1e1aba3b 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/job_context.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/job_context.py @@ -6,18 +6,20 @@ from dataclasses import dataclass from typing import cast -from taurus.api.job_input import IJobArguments -from taurus.api.job_input import IJobInput -from taurus.api.job_input import ITemplate -from taurus.api.plugin.plugin_input import IIngesterRegistry -from taurus.api.plugin.plugin_input import IManagedConnectionRegistry -from taurus.api.plugin.plugin_input import IPropertiesRegistry -from taurus.api.plugin.plugin_input import ITemplateRegistry -from taurus.vdk.builtin_plugins.connection.impl.router import ManagedConnectionRouter -from taurus.vdk.builtin_plugins.ingestion.ingester_router import IngesterRouter -from taurus.vdk.builtin_plugins.job_properties.properties_router import PropertiesRouter -from taurus.vdk.builtin_plugins.run.step import StepBuilder -from taurus.vdk.core.context import CoreContext +from vdk.api.job_input import IJobArguments +from vdk.api.job_input import IJobInput +from vdk.api.job_input import ITemplate +from vdk.api.plugin.plugin_input import IIngesterRegistry +from vdk.api.plugin.plugin_input import IManagedConnectionRegistry +from vdk.api.plugin.plugin_input import IPropertiesRegistry +from vdk.api.plugin.plugin_input import ITemplateRegistry +from vdk.internal.builtin_plugins.connection.impl.router import ManagedConnectionRouter +from vdk.internal.builtin_plugins.ingestion.ingester_router import IngesterRouter +from vdk.internal.builtin_plugins.job_properties.properties_router import ( + PropertiesRouter, +) +from vdk.internal.builtin_plugins.run.step import StepBuilder +from vdk.internal.core.context import CoreContext # TODO: split into mutable and immutable job context (e.g JobContextBuilder and JobContext) @@ -80,7 +82,7 @@ def __init__( job_name=self.name, cfg=core_context.configuration ) - from taurus.vdk.builtin_plugins.run.job_input import JobInput + from vdk.internal.builtin_plugins.run.job_input import JobInput self.job_input = JobInput( cast(ManagedConnectionRouter, self.connections), diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/job_input.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/job_input.py similarity index 85% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/job_input.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/job_input.py index b3b45b80c7..acf4ab1647 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/job_input.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/job_input.py @@ -6,26 +6,28 @@ from typing import List from typing import Optional -from taurus.api.job_input import IJobArguments -from taurus.api.job_input import IJobInput -from taurus.api.job_input import ITemplate -from taurus.vdk.builtin_plugins.connection.impl.router import ManagedConnectionRouter -from taurus.vdk.builtin_plugins.connection.managed_connection_base import ( +from vdk.api.job_input import IJobArguments +from vdk.api.job_input import IJobInput +from vdk.api.job_input import ITemplate +from vdk.internal.builtin_plugins.connection.impl.router import ManagedConnectionRouter +from vdk.internal.builtin_plugins.connection.managed_connection_base import ( ManagedConnectionBase, ) -from taurus.vdk.builtin_plugins.ingestion.ingester_router import IngesterRouter -from taurus.vdk.builtin_plugins.job_properties.properties_router import PropertiesRouter -from taurus.vdk.builtin_plugins.job_properties.Propertiesnotavailable import ( +from vdk.internal.builtin_plugins.ingestion.ingester_router import IngesterRouter +from vdk.internal.builtin_plugins.job_properties.properties_router import ( + PropertiesRouter, +) +from vdk.internal.builtin_plugins.job_properties.Propertiesnotavailable import ( PropertiesNotAvailable, ) -from taurus.vdk.builtin_plugins.run.execution_results import ExecutionResult -from taurus.vdk.builtin_plugins.run.execution_state import ExecutionStateStoreKeys -from taurus.vdk.builtin_plugins.run.sql_argument_substitutor import ( +from vdk.internal.builtin_plugins.run.execution_results import ExecutionResult +from vdk.internal.builtin_plugins.run.execution_state import ExecutionStateStoreKeys +from vdk.internal.builtin_plugins.run.sql_argument_substitutor import ( SqlArgumentSubstitutor, ) -from taurus.vdk.core.errors import UserCodeError -from taurus.vdk.core.statestore import CommonStoreKeys -from taurus.vdk.core.statestore import StateStore +from vdk.internal.core.errors import UserCodeError +from vdk.internal.core.statestore import CommonStoreKeys +from vdk.internal.core.statestore import StateStore # TODO make this extensible so new job inputs can be added by plugins diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/job_input_error_classifier.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/job_input_error_classifier.py similarity index 98% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/job_input_error_classifier.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/job_input_error_classifier.py index f12183bfb6..e98d4d7765 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/job_input_error_classifier.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/job_input_error_classifier.py @@ -7,7 +7,7 @@ import os import traceback -from taurus.vdk.core import errors +from vdk.internal.core import errors def whom_to_blame(exception, executor_module): diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/run_status.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/run_status.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/run_status.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/run_status.py diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/sql_argument_substitutor.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/sql_argument_substitutor.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/sql_argument_substitutor.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/sql_argument_substitutor.py diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/step.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/step.py similarity index 96% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/run/step.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/run/step.py index c3994c088c..2b7ee2b577 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/run/step.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/run/step.py @@ -9,7 +9,7 @@ from typing import Callable from typing import List -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/templates/template_impl.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/templates/template_impl.py similarity index 87% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/templates/template_impl.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/templates/template_impl.py index bc395ab30f..da312e4246 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/templates/template_impl.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/templates/template_impl.py @@ -4,12 +4,12 @@ import pathlib from typing import Dict -from taurus.api.job_input import ITemplate -from taurus.api.plugin.plugin_input import ITemplateRegistry -from taurus.vdk.builtin_plugins.run.data_job import DataJobFactory -from taurus.vdk.builtin_plugins.run.execution_results import ExecutionResult -from taurus.vdk.core import errors -from taurus.vdk.core.context import CoreContext +from vdk.api.job_input import ITemplate +from vdk.api.plugin.plugin_input import ITemplateRegistry +from vdk.internal.builtin_plugins.run.data_job import DataJobFactory +from vdk.internal.builtin_plugins.run.execution_results import ExecutionResult +from vdk.internal.core import errors +from vdk.internal.core.context import CoreContext log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/version/new_version_check.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/version/new_version_check.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/version/new_version_check.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/version/new_version_check.py diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/version/new_version_check_plugin.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/version/new_version_check_plugin.py similarity index 92% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/version/new_version_check_plugin.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/version/new_version_check_plugin.py index 3d70387cc5..051e25ffe2 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/version/new_version_check_plugin.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/version/new_version_check_plugin.py @@ -4,11 +4,11 @@ from enum import Enum import click -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.version import version -from taurus.vdk.builtin_plugins.version.new_version_check import Package -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.context import CoreContext +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.version import version +from vdk.internal.builtin_plugins.version.new_version_check import Package +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.context import CoreContext log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/builtin_plugins/version/version.py b/projects/vdk-core/src/vdk/internal/builtin_plugins/version/version.py similarity index 96% rename from projects/vdk-core/src/taurus/vdk/builtin_plugins/version/version.py rename to projects/vdk-core/src/vdk/internal/builtin_plugins/version/version.py index 89489fea47..4a99df52ad 100644 --- a/projects/vdk-core/src/taurus/vdk/builtin_plugins/version/version.py +++ b/projects/vdk-core/src/vdk/internal/builtin_plugins/version/version.py @@ -6,8 +6,8 @@ import click from pkg_resources import DistributionNotFound from pkg_resources import get_distribution -from taurus.api.plugin.hook_markers import GROUP_NAME -from taurus.vdk import vdk_build_info +from vdk.api.plugin.hook_markers import GROUP_NAME +from vdk.internal import vdk_build_info try: # importlib.metadata is used in 3.8+, importlib_metadata is used in 3.7 from importlib import metadata diff --git a/projects/vdk-core/src/taurus/vdk/cli_entry.py b/projects/vdk-core/src/vdk/internal/cli_entry.py similarity index 90% rename from projects/vdk-core/src/taurus/vdk/cli_entry.py rename to projects/vdk-core/src/vdk/internal/cli_entry.py index d57ebff1bc..c3176447fa 100644 --- a/projects/vdk-core/src/taurus/vdk/cli_entry.py +++ b/projects/vdk-core/src/vdk/internal/cli_entry.py @@ -10,16 +10,16 @@ from click import ClickException from click_plugins import with_plugins from pkg_resources import iter_entry_points -from taurus.api.plugin.core_hook_spec import CoreHookSpecs -from taurus.api.plugin.hook_markers import hookimpl -from taurus.api.plugin.plugin_registry import IPluginRegistry -from taurus.vdk.builtin_plugins import builtin_hook_impl -from taurus.vdk.builtin_plugins.internal_hookspecs import InternalHookSpecs -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.statestore import StateStore -from taurus.vdk.plugin.plugin import PluginRegistry +from vdk.api.plugin.core_hook_spec import CoreHookSpecs +from vdk.api.plugin.hook_markers import hookimpl +from vdk.api.plugin.plugin_registry import IPluginRegistry +from vdk.internal.builtin_plugins import builtin_hook_impl +from vdk.internal.builtin_plugins.internal_hookspecs import InternalHookSpecs +from vdk.internal.core.config import Configuration +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.context import CoreContext +from vdk.internal.core.statestore import StateStore +from vdk.internal.plugin.plugin import PluginRegistry log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/core/config.py b/projects/vdk-core/src/vdk/internal/core/config.py similarity index 99% rename from projects/vdk-core/src/taurus/vdk/core/config.py rename to projects/vdk-core/src/vdk/internal/core/config.py index 8899111b90..dbe01b50af 100644 --- a/projects/vdk-core/src/taurus/vdk/core/config.py +++ b/projects/vdk-core/src/vdk/internal/core/config.py @@ -8,7 +8,7 @@ from dataclasses import field from typing import Any -from taurus.vdk.core.errors import VdkConfigurationError +from vdk.internal.core.errors import VdkConfigurationError # Consider ConfigValue should be primitive type perhaps? and not just any object ConfigValue = Any diff --git a/projects/vdk-core/src/taurus/vdk/core/context.py b/projects/vdk-core/src/vdk/internal/core/context.py similarity index 86% rename from projects/vdk-core/src/taurus/vdk/core/context.py rename to projects/vdk-core/src/vdk/internal/core/context.py index f8fd67b401..d111b6c60d 100644 --- a/projects/vdk-core/src/taurus/vdk/core/context.py +++ b/projects/vdk-core/src/vdk/internal/core/context.py @@ -3,14 +3,14 @@ from dataclasses import dataclass from typing import List -from taurus.api.plugin.plugin_registry import IPluginRegistry -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.statestore import ImmutableStoreKey -from taurus.vdk.core.statestore import StateStore -from taurus.vdk.core.statestore import StoreKey +from vdk.api.plugin.plugin_registry import IPluginRegistry +from vdk.internal.core.config import Configuration +from vdk.internal.core.statestore import ImmutableStoreKey +from vdk.internal.core.statestore import StateStore +from vdk.internal.core.statestore import StoreKey -# TODO: consider moving some of those (or extracting interface) to taurus.api as they are used by users (plugin +# TODO: consider moving some of those (or extracting interface) to vdk.api as they are used by users (plugin # developers) diff --git a/projects/vdk-core/src/taurus/vdk/core/errors.py b/projects/vdk-core/src/vdk/internal/core/errors.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/core/errors.py rename to projects/vdk-core/src/vdk/internal/core/errors.py diff --git a/projects/vdk-core/src/taurus/vdk/core/statestore.py b/projects/vdk-core/src/vdk/internal/core/statestore.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/core/statestore.py rename to projects/vdk-core/src/vdk/internal/core/statestore.py diff --git a/projects/vdk-core/src/taurus/vdk/plugin/plugin.py b/projects/vdk-core/src/vdk/internal/plugin/plugin.py similarity index 93% rename from projects/vdk-core/src/taurus/vdk/plugin/plugin.py rename to projects/vdk-core/src/vdk/internal/plugin/plugin.py index 380f3416da..d411581ef9 100644 --- a/projects/vdk-core/src/taurus/vdk/plugin/plugin.py +++ b/projects/vdk-core/src/vdk/internal/plugin/plugin.py @@ -5,12 +5,12 @@ from typing import List from typing import Tuple -from taurus.api.plugin import hook_markers -from taurus.api.plugin.plugin_registry import IPluginRegistry -from taurus.api.plugin.plugin_registry import PluginException -from taurus.api.plugin.plugin_registry import PluginHookRelay -from taurus.vdk.core.errors import ErrorMessage -from taurus.vdk.plugin.plugin_manager import VdkPluginManager +from vdk.api.plugin import hook_markers +from vdk.api.plugin.plugin_registry import IPluginRegistry +from vdk.api.plugin.plugin_registry import PluginException +from vdk.api.plugin.plugin_registry import PluginHookRelay +from vdk.internal.core.errors import ErrorMessage +from vdk.internal.plugin.plugin_manager import VdkPluginManager log = logging.getLogger(__name__) diff --git a/projects/vdk-core/src/taurus/vdk/plugin/plugin_manager.py b/projects/vdk-core/src/vdk/internal/plugin/plugin_manager.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/plugin/plugin_manager.py rename to projects/vdk-core/src/vdk/internal/plugin/plugin_manager.py diff --git a/projects/vdk-core/src/taurus/vdk/util/decorators.py b/projects/vdk-core/src/vdk/internal/util/decorators.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/util/decorators.py rename to projects/vdk-core/src/vdk/internal/util/decorators.py diff --git a/projects/vdk-core/src/taurus/vdk/util/utils.py b/projects/vdk-core/src/vdk/internal/util/utils.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/util/utils.py rename to projects/vdk-core/src/vdk/internal/util/utils.py diff --git a/projects/vdk-core/src/taurus/vdk/vdk_build_info.py b/projects/vdk-core/src/vdk/internal/vdk_build_info.py similarity index 100% rename from projects/vdk-core/src/taurus/vdk/vdk_build_info.py rename to projects/vdk-core/src/vdk/internal/vdk_build_info.py diff --git a/projects/vdk-core/tests/functional/cli/test_set_cli_defaults.py b/projects/vdk-core/tests/functional/cli/test_set_cli_defaults.py index e736680495..3ba9232853 100644 --- a/projects/vdk-core/tests/functional/cli/test_set_cli_defaults.py +++ b/projects/vdk-core/tests/functional/cli/test_set_cli_defaults.py @@ -1,11 +1,11 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 import click -from taurus.api.plugin.hook_markers import hookimpl -from taurus.api.plugin.plugin_utils import set_defaults_for_all_commands -from taurus.api.plugin.plugin_utils import set_defaults_for_specific_command -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.api.plugin.hook_markers import hookimpl +from vdk.api.plugin.plugin_utils import set_defaults_for_all_commands +from vdk.api.plugin.plugin_utils import set_defaults_for_specific_command +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner def test_set_defaults_for_specific_command(): diff --git a/projects/vdk-core/tests/functional/run/jobs/ingest-job/1_step.py b/projects/vdk-core/tests/functional/run/jobs/ingest-job/1_step.py index c3e29c775d..2093825526 100644 --- a/projects/vdk-core/tests/functional/run/jobs/ingest-job/1_step.py +++ b/projects/vdk-core/tests/functional/run/jobs/ingest-job/1_step.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput): diff --git a/projects/vdk-core/tests/functional/run/jobs/job-using-templates/03_new_data.py b/projects/vdk-core/tests/functional/run/jobs/job-using-templates/03_new_data.py index 378b9fb99f..5896560d52 100644 --- a/projects/vdk-core/tests/functional/run/jobs/job-using-templates/03_new_data.py +++ b/projects/vdk-core/tests/functional/run/jobs/job-using-templates/03_new_data.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput): diff --git a/projects/vdk-core/tests/functional/run/jobs/job-using-templates/10_load_snapshot.py b/projects/vdk-core/tests/functional/run/jobs/job-using-templates/10_load_snapshot.py index e7a960209e..c39321564b 100644 --- a/projects/vdk-core/tests/functional/run/jobs/job-using-templates/10_load_snapshot.py +++ b/projects/vdk-core/tests/functional/run/jobs/job-using-templates/10_load_snapshot.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput): diff --git a/projects/vdk-core/tests/functional/run/jobs/job-with-args/2_python_step.py b/projects/vdk-core/tests/functional/run/jobs/job-with-args/2_python_step.py index de0aab50a1..bc29a13a92 100644 --- a/projects/vdk-core/tests/functional/run/jobs/job-with-args/2_python_step.py +++ b/projects/vdk-core/tests/functional/run/jobs/job-with-args/2_python_step.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput): diff --git a/projects/vdk-core/tests/functional/run/jobs/properties-job/10_copy_message.py b/projects/vdk-core/tests/functional/run/jobs/properties-job/10_copy_message.py index c85176337d..b34d2f8203 100644 --- a/projects/vdk-core/tests/functional/run/jobs/properties-job/10_copy_message.py +++ b/projects/vdk-core/tests/functional/run/jobs/properties-job/10_copy_message.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput): diff --git a/projects/vdk-core/tests/functional/run/jobs/simple-job/1_step.py b/projects/vdk-core/tests/functional/run/jobs/simple-job/1_step.py index 4ca67cc08d..152d5ecc9c 100644 --- a/projects/vdk-core/tests/functional/run/jobs/simple-job/1_step.py +++ b/projects/vdk-core/tests/functional/run/jobs/simple-job/1_step.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput): diff --git a/projects/vdk-core/tests/functional/run/jobs/template-append/02_append_to_table.py b/projects/vdk-core/tests/functional/run/jobs/template-append/02_append_to_table.py index 97454eab01..b8368eb8d4 100644 --- a/projects/vdk-core/tests/functional/run/jobs/template-append/02_append_to_table.py +++ b/projects/vdk-core/tests/functional/run/jobs/template-append/02_append_to_table.py @@ -1,6 +1,6 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.job_input import IJobInput +from vdk.api.job_input import IJobInput def run(job_input: IJobInput): diff --git a/projects/vdk-core/tests/functional/run/test_run_decorate_job_input.py b/projects/vdk-core/tests/functional/run/test_run_decorate_job_input.py index 3354c91b12..9fc00286df 100644 --- a/projects/vdk-core/tests/functional/run/test_run_decorate_job_input.py +++ b/projects/vdk-core/tests/functional/run/test_run_decorate_job_input.py @@ -7,12 +7,12 @@ from functional.run import util from functional.run.test_run_sql_queries import VDK_DB_DEFAULT_TYPE from functional.run.test_run_templates import AppendTemplatePlugin -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_plugins import DB_TYPE_SQLITE_MEMORY -from taurus.vdk.test_utils.util_plugins import SqLite3MemoryDbPlugin +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_plugins import DB_TYPE_SQLITE_MEMORY +from vdk.internal.test_utils.util_plugins import SqLite3MemoryDbPlugin class DecoratorsPlugin: diff --git a/projects/vdk-core/tests/functional/run/test_run_ingest.py b/projects/vdk-core/tests/functional/run/test_run_ingest.py index 3a58253ada..7ef6f3540f 100644 --- a/projects/vdk-core/tests/functional/run/test_run_ingest.py +++ b/projects/vdk-core/tests/functional/run/test_run_ingest.py @@ -5,9 +5,9 @@ from click.testing import Result from functional.run import util -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_plugins import IngestIntoMemoryPlugin +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_plugins import IngestIntoMemoryPlugin class FailingIngestIntoMemoryPlugin(IngestIntoMemoryPlugin): diff --git a/projects/vdk-core/tests/functional/run/test_run_notifications.py b/projects/vdk-core/tests/functional/run/test_run_notifications.py index 732f82a25e..e77c8939f7 100644 --- a/projects/vdk-core/tests/functional/run/test_run_notifications.py +++ b/projects/vdk-core/tests/functional/run/test_run_notifications.py @@ -7,11 +7,11 @@ from click.testing import Result from functional.run import util from smtpdfix import SMTPDFix -from taurus.vdk.core import errors -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_plugins import DB_TYPE_SQLITE_MEMORY -from taurus.vdk.test_utils.util_plugins import DecoratedSqLite3MemoryDbPlugin +from vdk.internal.core import errors +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_plugins import DB_TYPE_SQLITE_MEMORY +from vdk.internal.test_utils.util_plugins import DecoratedSqLite3MemoryDbPlugin os.environ["SMTPD_SSL_CERTS_PATH"] = "." diff --git a/projects/vdk-core/tests/functional/run/test_run_properties.py b/projects/vdk-core/tests/functional/run/test_run_properties.py index e54cd117c1..03b93915c0 100644 --- a/projects/vdk-core/tests/functional/run/test_run_properties.py +++ b/projects/vdk-core/tests/functional/run/test_run_properties.py @@ -2,9 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 from click.testing import Result from functional.run import util -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_plugins import TestPropertiesPlugin +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_plugins import TestPropertiesPlugin def test_run_properties(): diff --git a/projects/vdk-core/tests/functional/run/test_run_simple.py b/projects/vdk-core/tests/functional/run/test_run_simple.py index 17f1791b62..54a21eb1f5 100644 --- a/projects/vdk-core/tests/functional/run/test_run_simple.py +++ b/projects/vdk-core/tests/functional/run/test_run_simple.py @@ -2,8 +2,8 @@ # SPDX-License-Identifier: Apache-2.0 from click.testing import Result from functional.run import util -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner def test_run(): diff --git a/projects/vdk-core/tests/functional/run/test_run_sql_queries.py b/projects/vdk-core/tests/functional/run/test_run_sql_queries.py index 0ba6278aa5..da6c9227d2 100644 --- a/projects/vdk-core/tests/functional/run/test_run_sql_queries.py +++ b/projects/vdk-core/tests/functional/run/test_run_sql_queries.py @@ -7,13 +7,13 @@ from click.testing import Result from functional.run import util -from taurus.vdk.core.errors import VdkConfigurationError -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_funcs import get_test_job_path -from taurus.vdk.test_utils.util_plugins import DB_TYPE_SQLITE_MEMORY -from taurus.vdk.test_utils.util_plugins import DecoratedSqLite3MemoryDbPlugin -from taurus.vdk.test_utils.util_plugins import SqLite3MemoryDbPlugin +from vdk.internal.core.errors import VdkConfigurationError +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_funcs import get_test_job_path +from vdk.internal.test_utils.util_plugins import DB_TYPE_SQLITE_MEMORY +from vdk.internal.test_utils.util_plugins import DecoratedSqLite3MemoryDbPlugin +from vdk.internal.test_utils.util_plugins import SqLite3MemoryDbPlugin VDK_DB_DEFAULT_TYPE = "VDK_DB_DEFAULT_TYPE" diff --git a/projects/vdk-core/tests/functional/run/test_run_templates.py b/projects/vdk-core/tests/functional/run/test_run_templates.py index 11e070564c..10f4b1d031 100644 --- a/projects/vdk-core/tests/functional/run/test_run_templates.py +++ b/projects/vdk-core/tests/functional/run/test_run_templates.py @@ -7,13 +7,13 @@ from click.testing import Result from functional.run import util from functional.run.test_run_sql_queries import VDK_DB_DEFAULT_TYPE -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner -from taurus.vdk.test_utils.util_funcs import get_test_job_path -from taurus.vdk.test_utils.util_plugins import DB_TYPE_SQLITE_MEMORY -from taurus.vdk.test_utils.util_plugins import SqLite3MemoryDbPlugin +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_funcs import get_test_job_path +from vdk.internal.test_utils.util_plugins import DB_TYPE_SQLITE_MEMORY +from vdk.internal.test_utils.util_plugins import SqLite3MemoryDbPlugin class AppendTemplatePlugin: diff --git a/projects/vdk-core/tests/functional/run/util.py b/projects/vdk-core/tests/functional/run/util.py index f172005045..063637de3b 100644 --- a/projects/vdk-core/tests/functional/run/util.py +++ b/projects/vdk-core/tests/functional/run/util.py @@ -3,7 +3,7 @@ import os import pathlib -from taurus.vdk.test_utils.util_funcs import get_test_job_path +from vdk.internal.test_utils.util_funcs import get_test_job_path def job_path(job_name: str): diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_config_help.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_config_help.py index 9fc625c1a9..c5259f9792 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_config_help.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_config_help.py @@ -1,10 +1,10 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.builtin_plugins.config.config_help import ConfigHelpPlugin -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.builtin_plugins.config.config_help import ConfigHelpPlugin +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner class TestConfigPlugin: diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_job_config.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_job_config.py index 7849ae8fb4..01bfae3d33 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_job_config.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_job_config.py @@ -5,7 +5,7 @@ import shutil import tempfile -from taurus.vdk.builtin_plugins.config.job_config import JobConfig +from vdk.internal.builtin_plugins.config.job_config import JobConfig class TestJobConfig: diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_log_config.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_log_config.py index b9989005ed..3e3c22d0d0 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_log_config.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/config/test_log_config.py @@ -5,16 +5,16 @@ from unittest.mock import MagicMock import pytest -from taurus.api.plugin.plugin_registry import IPluginRegistry -from taurus.vdk.builtin_plugins.config import vdk_config -from taurus.vdk.builtin_plugins.config.log_config import LoggingPlugin -from taurus.vdk.builtin_plugins.run.data_job import JobArguments -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.builtin_plugins.templates.template_impl import TemplatesImpl -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.statestore import CommonStoreKeys -from taurus.vdk.core.statestore import StateStore +from vdk.api.plugin.plugin_registry import IPluginRegistry +from vdk.internal.builtin_plugins.config import vdk_config +from vdk.internal.builtin_plugins.config.log_config import LoggingPlugin +from vdk.internal.builtin_plugins.run.data_job import JobArguments +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.builtin_plugins.templates.template_impl import TemplatesImpl +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.context import CoreContext +from vdk.internal.core.statestore import CommonStoreKeys +from vdk.internal.core.statestore import StateStore # TODO: we should patch logging, this changes it for all tests diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/connection/test_connection_router.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/connection/test_connection_router.py index 928f748a3e..2fb1692ad1 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/connection/test_connection_router.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/connection/test_connection_router.py @@ -3,13 +3,13 @@ from unittest.mock import MagicMock import pytest -from taurus.vdk.builtin_plugins.connection.impl.router import ManagedConnectionRouter -from taurus.vdk.builtin_plugins.connection.managed_connection_base import ( +from vdk.internal.builtin_plugins.connection.impl.router import ManagedConnectionRouter +from vdk.internal.builtin_plugins.connection.managed_connection_base import ( ManagedConnectionBase, ) -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Connection -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.errors import VdkConfigurationError +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Connection +from vdk.internal.core.config import Configuration +from vdk.internal.core.errors import VdkConfigurationError def managed_connection_router(): diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/connection/test_managed_connection_base.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/connection/test_managed_connection_base.py index 982f70b2ec..e7f0dda346 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/connection/test_managed_connection_base.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/connection/test_managed_connection_base.py @@ -5,11 +5,11 @@ from unittest.mock import MagicMock import pytest -from taurus.vdk.builtin_plugins.connection.managed_connection_base import ( +from vdk.internal.builtin_plugins.connection.managed_connection_base import ( ManagedConnectionBase, ) -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Connection -from taurus.vdk.builtin_plugins.connection.pep249.interfaces import PEP249Cursor +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Connection +from vdk.internal.builtin_plugins.connection.pep249.interfaces import PEP249Cursor log = logging.getLogger(__name__) diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/debug/test_debug.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/debug/test_debug.py index d3c92b7033..2d589a77fa 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/debug/test_debug.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/debug/test_debug.py @@ -1,10 +1,10 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.api.plugin.hook_markers import hookimpl -from taurus.api.plugin.hook_markers import hookspec -from taurus.vdk.builtin_plugins.debug.debug import HookRecorder -from taurus.vdk.builtin_plugins.debug.debug import ParsedCall -from taurus.vdk.plugin.plugin import PluginRegistry +from vdk.api.plugin.hook_markers import hookimpl +from vdk.api.plugin.hook_markers import hookspec +from vdk.internal.builtin_plugins.debug.debug import HookRecorder +from vdk.internal.builtin_plugins.debug.debug import ParsedCall +from vdk.internal.plugin.plugin import PluginRegistry def test_hook_recorder(): diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/ingestion/test_ingester_base.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/ingestion/test_ingester_base.py index 0f05852335..3752e9ba99 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/ingestion/test_ingester_base.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/ingestion/test_ingester_base.py @@ -6,13 +6,13 @@ from unittest.mock import patch import pytest -from taurus.api.plugin.plugin_input import IIngesterPlugin -from taurus.vdk.builtin_plugins.ingestion.ingester_base import IngesterBase -from taurus.vdk.builtin_plugins.ingestion.ingester_configuration import ( +from vdk.api.plugin.plugin_input import IIngesterPlugin +from vdk.internal.builtin_plugins.ingestion.ingester_base import IngesterBase +from vdk.internal.builtin_plugins.ingestion.ingester_configuration import ( IngesterConfiguration, ) -from taurus.vdk.core import errors -from taurus.vdk.core.config import Configuration +from vdk.internal.core import errors +from vdk.internal.core.config import Configuration def create_ingester_base() -> IngesterBase: diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_cached_properties.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_cached_properties.py index 05c2c015d9..021e7ecbf6 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_cached_properties.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_cached_properties.py @@ -3,8 +3,8 @@ import unittest from unittest.mock import MagicMock -from taurus.api.job_input import IProperties -from taurus.vdk.builtin_plugins.job_properties.cached_properties import ( +from vdk.api.job_input import IProperties +from vdk.internal.builtin_plugins.job_properties.cached_properties import ( CachedPropertiesWrapper, ) diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_datajob_service_properties.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_datajob_service_properties.py index b8f7c6adeb..3f04296cb3 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_datajob_service_properties.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_datajob_service_properties.py @@ -2,10 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 import unittest -from taurus.vdk.builtin_plugins.job_properties.datajobs_service_properties import ( +from vdk.internal.builtin_plugins.job_properties.datajobs_service_properties import ( DataJobsServiceProperties, ) -from taurus.vdk.builtin_plugins.job_properties.inmemproperties import ( +from vdk.internal.builtin_plugins.job_properties.inmemproperties import ( InMemPropertiesServiceClient, ) diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_properties_router.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_properties_router.py index e823d7e8a1..d84abbf23f 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_properties_router.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/job_properties/test_properties_router.py @@ -4,10 +4,12 @@ from unittest.mock import Mock import pytest -from taurus.api.plugin.plugin_input import IPropertiesServiceClient -from taurus.vdk.builtin_plugins.job_properties.properties_router import PropertiesRouter -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.errors import VdkConfigurationError +from vdk.api.plugin.plugin_input import IPropertiesServiceClient +from vdk.internal.builtin_plugins.job_properties.properties_router import ( + PropertiesRouter, +) +from vdk.internal.core.config import Configuration +from vdk.internal.core.errors import VdkConfigurationError def test_routing(): diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/notification/test_notification.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/notification/test_notification.py index 79c5e3b7fe..6dbc8f302b 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/notification/test_notification.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/notification/test_notification.py @@ -7,11 +7,11 @@ from typing import cast from unittest.mock import patch -from taurus.vdk.builtin_plugins.notification import notification_base -from taurus.vdk.builtin_plugins.notification.notification_configuration import ( +from vdk.internal.builtin_plugins.notification import notification_base +from vdk.internal.builtin_plugins.notification.notification_configuration import ( SmtpConfiguration, ) -from taurus.vdk.core.config import Configuration +from vdk.internal.core.config import Configuration job_log_url_template = ( "https://test.log.com/explorer/?existingChartQuery=%7B%22query" @@ -36,7 +36,7 @@ class NotificationTest(unittest.TestCase): @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._email_address_exists" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._email_address_exists" ) def test_get_valid_recipients(self, mock_email_exists): mock_email_exists.side_effect = [True, False] @@ -46,7 +46,7 @@ def test_get_valid_recipients(self, mock_email_exists): self.assertEqual(["valid1@test.com"], valid_recipients) - @patch("taurus.vdk.builtin_plugins.notification.notification_base.LoggingSMTP") + @patch("vdk.internal.builtin_plugins.notification.notification_base.LoggingSMTP") def test_email_address_exists_valid_email(self, mock_smtp): mock_smtp.return_value.rcpt.return_value = (250,) email_notification = notification_base.EmailNotification( @@ -65,13 +65,13 @@ def test_email_address_exists_valid_email(self, mock_smtp): ) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._get_valid_recipients" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._get_valid_recipients" ) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._build_message" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._build_message" ) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._send_message" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._send_message" ) def test_notify( self, mock_send_message, mock_build_message, mock_get_valid_recipients @@ -101,13 +101,13 @@ def test_notify( self.assertEqual("text/html", sent_message.get_content_type()) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._get_valid_recipients" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._get_valid_recipients" ) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._build_message" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._build_message" ) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._send_message" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._send_message" ) def test_notify_no_recipient_emails( self, mock_send_message, mock_build_message, mock_get_valid_recipients @@ -124,16 +124,16 @@ def test_notify_no_recipient_emails( self.assertEqual(mock_send_message.call_count, 0) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._get_valid_cc" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._get_valid_cc" ) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._get_valid_recipients" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._get_valid_recipients" ) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._build_message" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._build_message" ) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.EmailNotification._send_message" + "vdk.internal.builtin_plugins.notification.notification_base.EmailNotification._send_message" ) def test_notify_no_valid_emails( self, @@ -155,7 +155,7 @@ def test_notify_no_valid_emails( self.assertEqual(mock_build_message.call_count, 1) self.assertEqual(mock_send_message.call_count, 1) - @patch("taurus.vdk.builtin_plugins.notification.notification_base.LoggingSMTP") + @patch("vdk.internal.builtin_plugins.notification.notification_base.LoggingSMTP") def test_send_email_message(self, mock_smtp): msg = notification_base.EmailNotification( [], cc, smtp_cfg, sender @@ -229,7 +229,7 @@ def test_get_job_log_chunk_wo_op_id(self): self._assert_equal_str_without_whitespaces("", actual_chunk) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.UserErrorEmailNotificationMessageBuilder._get_job_log_chunk" + "vdk.internal.builtin_plugins.notification.notification_base.UserErrorEmailNotificationMessageBuilder._get_job_log_chunk" ) def test_build_user_error(self, mock_get_job_log_chunk): mock_get_job_log_chunk.return_value = "some_chunk" @@ -344,7 +344,7 @@ def test_build_infra_unknown_exec_type_error(self, mock_logger): self._assert_equal_str_without_whitespaces(expected_body, actual_body) @patch( - "taurus.vdk.builtin_plugins.notification.notification_base.SuccessEmailNotificationMessageBuilder._get_job_log_chunk" + "vdk.internal.builtin_plugins.notification.notification_base.SuccessEmailNotificationMessageBuilder._get_job_log_chunk" ) def test_build_success(self, mock_get_job_log_chunk): mock_get_job_log_chunk.return_value = "some_chunk" diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/notification/test_notification_configuration.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/notification/test_notification_configuration.py index cc6a8e4960..1fe1ea43a2 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/notification/test_notification_configuration.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/notification/test_notification_configuration.py @@ -2,10 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 from typing import cast -from taurus.vdk.builtin_plugins.notification.notification_configuration import ( +from vdk.internal.builtin_plugins.notification.notification_configuration import ( NotificationConfiguration, ) -from taurus.vdk.core.config import Configuration +from vdk.internal.core.config import Configuration def test_notification(): diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/job_input_error_classifier_test.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/job_input_error_classifier_test.py index 71c532717c..b85a087c18 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/job_input_error_classifier_test.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/job_input_error_classifier_test.py @@ -6,10 +6,10 @@ from unittest.mock import MagicMock from unittest.mock import patch -from taurus.vdk.builtin_plugins.run import data_job -from taurus.vdk.builtin_plugins.run.job_input_error_classifier import is_user_error -from taurus.vdk.builtin_plugins.run.job_input_error_classifier import whom_to_blame -from taurus.vdk.core import errors +from vdk.internal.builtin_plugins.run import data_job +from vdk.internal.builtin_plugins.run.job_input_error_classifier import is_user_error +from vdk.internal.builtin_plugins.run.job_input_error_classifier import whom_to_blame +from vdk.internal.core import errors class ErrorClassifierTest(unittest.TestCase): diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_cli_run.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_cli_run.py index 7f8fad762e..7863a76326 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_cli_run.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_cli_run.py @@ -6,15 +6,15 @@ import py import pytest -from taurus.api.plugin.plugin_registry import IPluginRegistry -from taurus.vdk.builtin_plugins.run.cli_run import CliRunImpl -from taurus.vdk.builtin_plugins.run.data_job import DataJob -from taurus.vdk.builtin_plugins.run.data_job import DataJobFactory -from taurus.vdk.builtin_plugins.run.execution_results import ExecutionResult -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.errors import UserCodeError -from taurus.vdk.core.statestore import StateStore +from vdk.api.plugin.plugin_registry import IPluginRegistry +from vdk.internal.builtin_plugins.run.cli_run import CliRunImpl +from vdk.internal.builtin_plugins.run.data_job import DataJob +from vdk.internal.builtin_plugins.run.data_job import DataJobFactory +from vdk.internal.builtin_plugins.run.execution_results import ExecutionResult +from vdk.internal.core.config import Configuration +from vdk.internal.core.context import CoreContext +from vdk.internal.core.errors import UserCodeError +from vdk.internal.core.statestore import StateStore @pytest.fixture diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_data_job.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_data_job.py index 84f02f45e3..3abf0ab8b6 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_data_job.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_data_job.py @@ -2,13 +2,13 @@ # SPDX-License-Identifier: Apache-2.0 from typing import Optional -from taurus.api.job_input import IJobInput -from taurus.api.plugin.hook_markers import hookimpl -from taurus.api.plugin.plugin_registry import HookCallResult -from taurus.vdk.builtin_plugins.run.execution_results import ExecutionResult -from taurus.vdk.builtin_plugins.run.job_context import JobContext -from taurus.vdk.builtin_plugins.run.step import Step -from taurus.vdk.test_utils.util_funcs import DataJobBuilder +from vdk.api.job_input import IJobInput +from vdk.api.plugin.hook_markers import hookimpl +from vdk.api.plugin.plugin_registry import HookCallResult +from vdk.internal.builtin_plugins.run.execution_results import ExecutionResult +from vdk.internal.builtin_plugins.run.job_context import JobContext +from vdk.internal.builtin_plugins.run.step import Step +from vdk.internal.test_utils.util_funcs import DataJobBuilder def failing_runner_func(step: Step, job_input: IJobInput) -> bool: diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_execution_results.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_execution_results.py index 3c0a7bfec9..3bd7713403 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_execution_results.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_execution_results.py @@ -3,9 +3,9 @@ import json from datetime import datetime -from taurus.vdk.builtin_plugins.run.execution_results import ExecutionResult -from taurus.vdk.builtin_plugins.run.execution_results import StepResult -from taurus.vdk.builtin_plugins.run.run_status import ExecutionStatus +from vdk.internal.builtin_plugins.run.execution_results import ExecutionResult +from vdk.internal.builtin_plugins.run.execution_results import StepResult +from vdk.internal.builtin_plugins.run.run_status import ExecutionStatus class NonJsonSerializable: diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_sql_argument_substitutor.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_sql_argument_substitutor.py index c2edba9a57..ea999d4dc6 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_sql_argument_substitutor.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_sql_argument_substitutor.py @@ -1,7 +1,7 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 import pytest -from taurus.vdk.builtin_plugins.run.sql_argument_substitutor import ( +from vdk.internal.builtin_plugins.run.sql_argument_substitutor import ( SqlArgumentSubstitutor, ) diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_substitute_query_params.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_substitute_query_params.py index f75eb9a189..f7d437f0d0 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_substitute_query_params.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/run/test_substitute_query_params.py @@ -2,13 +2,15 @@ # SPDX-License-Identifier: Apache-2.0 from unittest.mock import MagicMock -from taurus.vdk.builtin_plugins.job_properties.inmemproperties import ( +from vdk.internal.builtin_plugins.job_properties.inmemproperties import ( InMemPropertiesServiceClient, ) -from taurus.vdk.builtin_plugins.job_properties.properties_router import PropertiesRouter -from taurus.vdk.builtin_plugins.run.data_job import JobArguments -from taurus.vdk.builtin_plugins.run.job_input import JobInput -from taurus.vdk.core.config import Configuration +from vdk.internal.builtin_plugins.job_properties.properties_router import ( + PropertiesRouter, +) +from vdk.internal.builtin_plugins.run.data_job import JobArguments +from vdk.internal.builtin_plugins.run.job_input import JobInput +from vdk.internal.core.config import Configuration def _get_properties_in_memory(): diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/templates/test_template_impl.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/templates/test_template_impl.py index 2c5380d449..d64d0d6e53 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/templates/test_template_impl.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/templates/test_template_impl.py @@ -4,10 +4,10 @@ from unittest.mock import MagicMock import pytest -from taurus.vdk.builtin_plugins.run.data_job import DataJobFactory -from taurus.vdk.builtin_plugins.templates.template_impl import TemplatesImpl -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.errors import UserCodeError +from vdk.internal.builtin_plugins.run.data_job import DataJobFactory +from vdk.internal.builtin_plugins.templates.template_impl import TemplatesImpl +from vdk.internal.core.context import CoreContext +from vdk.internal.core.errors import UserCodeError def test_template_builder(): diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_new_version_check.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_new_version_check.py index 9809604e26..cc0ac86029 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_new_version_check.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_new_version_check.py @@ -6,7 +6,7 @@ from unittest.mock import Mock from unittest.mock import patch -from taurus.vdk.builtin_plugins.version.new_version_check import Package +from vdk.internal.builtin_plugins.version.new_version_check import Package class PackageTests(unittest.TestCase): diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_new_version_check_plugin.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_new_version_check_plugin.py index 31653df591..297132206e 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_new_version_check_plugin.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_new_version_check_plugin.py @@ -4,16 +4,16 @@ from unittest.mock import MagicMock from unittest.mock import patch -from taurus.api.plugin.plugin_registry import IPluginRegistry -from taurus.vdk.builtin_plugins.version import new_version_check_plugin -from taurus.vdk.builtin_plugins.version import version -from taurus.vdk.builtin_plugins.version.new_version_check_plugin import new_package -from taurus.vdk.builtin_plugins.version.new_version_check_plugin import ( +from vdk.api.plugin.plugin_registry import IPluginRegistry +from vdk.internal.builtin_plugins.version import new_version_check_plugin +from vdk.internal.builtin_plugins.version import version +from vdk.internal.builtin_plugins.version.new_version_check_plugin import new_package +from vdk.internal.builtin_plugins.version.new_version_check_plugin import ( NewVersionCheckPlugin, ) -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.statestore import StateStore +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.context import CoreContext +from vdk.internal.core.statestore import StateStore def build_configuration(plugin, config: Dict): diff --git a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_version.py b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_version.py index 0b2f9cec42..6d2392a7e6 100644 --- a/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_version.py +++ b/projects/vdk-core/tests/taurus/vdk/builtin_plugins/version/test_version.py @@ -1,7 +1,7 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner def test_version(): diff --git a/projects/vdk-core/tests/taurus/vdk/core/test_config.py b/projects/vdk-core/tests/taurus/vdk/core/test_config.py index 761e3d4641..9d7396e6b5 100644 --- a/projects/vdk-core/tests/taurus/vdk/core/test_config.py +++ b/projects/vdk-core/tests/taurus/vdk/core/test_config.py @@ -1,8 +1,8 @@ # Copyright 2021 VMware, Inc. # SPDX-License-Identifier: Apache-2.0 import pytest -from taurus.vdk.core.config import ConfigurationBuilder -from taurus.vdk.core.errors import VdkConfigurationError +from vdk.internal.core.config import ConfigurationBuilder +from vdk.internal.core.errors import VdkConfigurationError @pytest.mark.parametrize( @@ -79,7 +79,7 @@ def test_list_config_keys(): def test_conversions(): - from taurus.vdk.core import config + from vdk.internal.core import config assertEqual( "some value", @@ -110,7 +110,7 @@ def test_conversions(): ) assertEqual(1, config.convert_value_to_type_of_default_type("somekey", "1", 2)) - from taurus.vdk.core.errors import VdkConfigurationError + from vdk.internal.core.errors import VdkConfigurationError with pytest.raises(VdkConfigurationError): # cannot convert 'x' to int config.convert_value_to_type_of_default_type("somekey", "x", 1) diff --git a/projects/vdk-core/tests/taurus/vdk/core/test_core_context.py b/projects/vdk-core/tests/taurus/vdk/core/test_core_context.py index 5a62a01f5e..4e10128777 100644 --- a/projects/vdk-core/tests/taurus/vdk/core/test_core_context.py +++ b/projects/vdk-core/tests/taurus/vdk/core/test_core_context.py @@ -2,10 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 from unittest.mock import MagicMock -from taurus.api.plugin.plugin_registry import IPluginRegistry -from taurus.vdk.core.config import Configuration -from taurus.vdk.core.context import CoreContext -from taurus.vdk.core.statestore import StateStore +from vdk.api.plugin.plugin_registry import IPluginRegistry +from vdk.internal.core.config import Configuration +from vdk.internal.core.context import CoreContext +from vdk.internal.core.statestore import StateStore def test_core_context_child_context(): diff --git a/projects/vdk-core/tests/taurus/vdk/core/test_errors.py b/projects/vdk-core/tests/taurus/vdk/core/test_errors.py index 5e9a402243..04b7b7b848 100644 --- a/projects/vdk-core/tests/taurus/vdk/core/test_errors.py +++ b/projects/vdk-core/tests/taurus/vdk/core/test_errors.py @@ -6,10 +6,10 @@ from unittest.mock import MagicMock import pytest -from taurus.vdk.core import errors -from taurus.vdk.core.errors import PlatformServiceError -from taurus.vdk.core.errors import UserCodeError -from taurus.vdk.core.errors import VdkConfigurationError +from vdk.internal.core import errors +from vdk.internal.core.errors import PlatformServiceError +from vdk.internal.core.errors import UserCodeError +from vdk.internal.core.errors import VdkConfigurationError log = logging.getLogger(__name__) diff --git a/projects/vdk-core/tests/taurus/vdk/core/test_statestore.py b/projects/vdk-core/tests/taurus/vdk/core/test_statestore.py index c9009675bc..a24407e610 100644 --- a/projects/vdk-core/tests/taurus/vdk/core/test_statestore.py +++ b/projects/vdk-core/tests/taurus/vdk/core/test_statestore.py @@ -3,9 +3,9 @@ from dataclasses import dataclass import pytest -from taurus.vdk.core.statestore import ImmutableStoreKey -from taurus.vdk.core.statestore import StateStore -from taurus.vdk.core.statestore import StoreKey +from vdk.internal.core.statestore import ImmutableStoreKey +from vdk.internal.core.statestore import StateStore +from vdk.internal.core.statestore import StoreKey def test_statestore_add_new() -> None: diff --git a/projects/vdk-core/tests/taurus/vdk/plugin/test_plugin.py b/projects/vdk-core/tests/taurus/vdk/plugin/test_plugin.py index c787232476..bf92aef189 100644 --- a/projects/vdk-core/tests/taurus/vdk/plugin/test_plugin.py +++ b/projects/vdk-core/tests/taurus/vdk/plugin/test_plugin.py @@ -4,10 +4,10 @@ import pytest from pluggy import PluginManager -from taurus.api.plugin.hook_markers import hookimpl -from taurus.api.plugin.hook_markers import hookspec -from taurus.api.plugin.plugin_registry import PluginException -from taurus.vdk.plugin.plugin import PluginRegistry +from vdk.api.plugin.hook_markers import hookimpl +from vdk.api.plugin.hook_markers import hookspec +from vdk.api.plugin.plugin_registry import PluginException +from vdk.internal.plugin.plugin import PluginRegistry class JokesHookSpec: @@ -63,7 +63,7 @@ def get_a_joke(self, wrong_param: int): def test_cannot_load_entrypoints_plugins(): with patch( - "taurus.vdk.plugin.plugin_manager.VdkPluginManager", spec=PluginManager + "vdk.internal.plugin.plugin_manager.VdkPluginManager", spec=PluginManager ) as mock_plugin_manager: mock_plugin_manager.hook = None mock_plugin_manager.load_setuptools_entrypoints.side_effect = Exception("foo") diff --git a/projects/vdk-core/tests/taurus/vdk/plugin/test_plugin_utils.py b/projects/vdk-core/tests/taurus/vdk/plugin/test_plugin_utils.py index c662f18963..92979bf220 100644 --- a/projects/vdk-core/tests/taurus/vdk/plugin/test_plugin_utils.py +++ b/projects/vdk-core/tests/taurus/vdk/plugin/test_plugin_utils.py @@ -4,9 +4,9 @@ from unittest import mock import click -from taurus.api.plugin.plugin_utils import set_defaults_for_all_commands -from taurus.api.plugin.plugin_utils import set_defaults_for_specific_command -from taurus.vdk.core.errors import VdkConfigurationError +from vdk.api.plugin.plugin_utils import set_defaults_for_all_commands +from vdk.api.plugin.plugin_utils import set_defaults_for_specific_command +from vdk.internal.core.errors import VdkConfigurationError class TestPluginUtils(unittest.TestCase): diff --git a/projects/vdk-core/tests/taurus/vdk/test_cli_entry.py b/projects/vdk-core/tests/taurus/vdk/test_cli_entry.py index 9dae0b4b64..2d0c63c70e 100644 --- a/projects/vdk-core/tests/taurus/vdk/test_cli_entry.py +++ b/projects/vdk-core/tests/taurus/vdk/test_cli_entry.py @@ -2,10 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 import click from click.testing import CliRunner -from taurus.api.plugin.hook_markers import hookimpl -from taurus.vdk.cli_entry import cli -from taurus.vdk.test_utils.util_funcs import cli_assert_equal -from taurus.vdk.test_utils.util_funcs import CliEntryBasedTestRunner +from vdk.api.plugin.hook_markers import hookimpl +from vdk.internal.cli_entry import cli +from vdk.internal.test_utils.util_funcs import cli_assert_equal +from vdk.internal.test_utils.util_funcs import CliEntryBasedTestRunner def test_cli():