diff --git a/airbyte-integrations/bases/base-python/base_python/__init__.py b/airbyte-integrations/bases/base-python/base_python/__init__.py index 22d5123222e2d..f9fdaa310976b 100644 --- a/airbyte-integrations/bases/base-python/base_python/__init__.py +++ b/airbyte-integrations/bases/base-python/base_python/__init__.py @@ -26,14 +26,14 @@ from base_python.client import BaseClient from base_python.integration import AirbyteSpec, Destination, Integration, Source from base_python.logger import AirbyteLogger -from base_python.sdk.abstract_source import AbstractSource +from base_python.source import BaseSource # Separate the SDK imports so they can be moved somewhere else more easily +from base_python.sdk.abstract_source import AbstractSource from base_python.sdk.streams.auth.core import HttpAuthenticator from base_python.sdk.streams.auth.token import TokenAuthenticator from base_python.sdk.streams.core import Stream from base_python.sdk.streams.http import HttpStream -from base_python.source import BaseSource # Must be the last one because the way we load the connector module creates a circular # dependency and models might not have been loaded yet diff --git a/airbyte-integrations/bases/base-python/base_python/entrypoint.py b/airbyte-integrations/bases/base-python/base_python/entrypoint.py index 8c5fcb325568a..bfc2b196f2eef 100644 --- a/airbyte-integrations/bases/base-python/base_python/entrypoint.py +++ b/airbyte-integrations/bases/base-python/base_python/entrypoint.py @@ -30,8 +30,8 @@ from airbyte_protocol import AirbyteMessage, Status, Type -from .integration import Source -from .logger import AirbyteLogger +from base_python.integration import Source +from base_python.logger import AirbyteLogger logger = AirbyteLogger() @@ -116,7 +116,6 @@ def start(self, args): def launch(source, args): - AirbyteEntrypoint(source).start(args) @@ -133,3 +132,7 @@ def main(): raise Exception("Source implementation provided does not implement Source class!") launch(source, sys.argv[1:]) + + +if __name__ == '__main__': + main() diff --git a/airbyte-integrations/bases/base-python/base_python/sdk/__init__.py b/airbyte-integrations/bases/base-python/base_python/sdk/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/airbyte-integrations/bases/base-python/base_python/sdk/streams/__init__.py b/airbyte-integrations/bases/base-python/base_python/sdk/streams/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/airbyte-integrations/bases/base-python/base_python/sdk/streams/auth/__init__.py b/airbyte-integrations/bases/base-python/base_python/sdk/streams/auth/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/airbyte-integrations/bases/base-python/base_python/sdk/utils/__init__.py b/airbyte-integrations/bases/base-python/base_python/sdk/utils/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/airbyte-integrations/connectors/source-iterable/Dockerfile b/airbyte-integrations/connectors/source-iterable/Dockerfile index 21efa9d1a7475..753a5fb79580b 100644 --- a/airbyte-integrations/connectors/source-iterable/Dockerfile +++ b/airbyte-integrations/connectors/source-iterable/Dockerfile @@ -1,4 +1,4 @@ -FROM airbyte/integration-base-python:0.1.2 +FROM airbyte/integration-base-python:dev # Bash is installed for more convenient debugging. RUN apt-get update && apt-get install -y bash && rm -rf /var/lib/apt/lists/* diff --git a/airbyte-integrations/connectors/source-iterable/setup.py b/airbyte-integrations/connectors/source-iterable/setup.py index 72052d883cae8..11ef45ae16358 100644 --- a/airbyte-integrations/connectors/source-iterable/setup.py +++ b/airbyte-integrations/connectors/source-iterable/setup.py @@ -30,6 +30,6 @@ author="Airbyte", author_email="contact@airbyte.io", packages=find_packages(), - install_requires=["airbyte-protocol", "pytest==6.1.2", "pendulum", "requests"], + install_requires=["airbyte-protocol", "base-python", "pytest==6.1.2", "pendulum", "requests"], package_data={"": ["*.json", "schemas/*.json"]}, )