Skip to content

Commit f98e6c2

Browse files
alafanecherexiaohansong
authored andcommitted
✨ source-bing-ads: migrate to poetry (#35179)
1 parent c979226 commit f98e6c2

File tree

6 files changed

+1301
-164
lines changed

6 files changed

+1301
-164
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,55 @@
1-
# Bing Ads Source
1+
# Bing-Ads source connector
22

3-
This is the repository for the Bing Ads source connector, written in Python.
4-
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/bing-ads).
3+
4+
This is the repository for the Bing-Ads source connector, written in Python.
5+
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.com/integrations/sources/bing-ads).
56

67
## Local development
78

89
### Prerequisites
9-
**To iterate on this connector, make sure to complete this prerequisites section.**
10-
11-
#### Minimum Python version required `= 3.7.0`
12-
13-
#### Debugging tips
10+
* Python (~=3.9)
11+
* Poetry (~=1.7) - installation instructions [here](https://python-poetry.org/docs/#installation)
1412

15-
Put this code to the top of `source.py` file to be able to debug API requests/responses
16-
17-
```python
18-
import logging
19-
logging.basicConfig(level=logging.INFO)
20-
logging.getLogger("suds.client").setLevel(logging.DEBUG)
21-
logging.getLogger("suds.transport.http").setLevel(logging.DEBUG)
22-
```
23-
24-
#### Caching responses
25-
We need to cache `Accounts` to reuse in `Campaigns`, cache `Campaigns` to reuse in `AdGroups` and cache `AdGroups` to reuse in `Ads`
26-
27-
28-
#### Build & Activate Virtual Environment and install dependencies
29-
From this connector directory, create a virtual environment:
30-
```
31-
python -m venv .venv
32-
```
3313

34-
This will generate a virtualenv for this module in `.venv/`. Make sure this venv is active in your
35-
development environment of choice. To activate it from the terminal, run:
36-
```
37-
source .venv/bin/activate
38-
pip install -r requirements.txt
14+
### Installing the connector
15+
From this connector directory, run:
16+
```bash
17+
poetry install --with dev
3918
```
40-
If you are in an IDE, follow your IDE's instructions to activate the virtualenv.
4119

42-
Note that while we are installing dependencies from `requirements.txt`, you should only edit `setup.py` for your dependencies. `requirements.txt` is
43-
used for editable installs (`pip install -e`) to pull in Python dependencies from the monorepo and will call `setup.py`.
44-
If this is mumbo jumbo to you, don't worry about it, just put your deps in `setup.py` but install using `pip install -r requirements.txt` and everything
45-
should work as you expect.
4620

47-
#### Create credentials
48-
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/bing-ads)
49-
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_bing_ads/spec.json` file.
21+
### Create credentials
22+
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/bing-ads)
23+
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_bing_ads/spec.yaml` file.
5024
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
51-
See `integration_tests/sample_config.json` for a sample config file.
25+
See `sample_files/sample_config.json` for a sample config file.
5226

53-
**If you are an Airbyte core member**, copy the credentials in Lastpass under the secret name `source bing-ads test creds`
54-
and place them into `secrets/config.json`.
5527

5628
### Locally running the connector
5729
```
58-
python main.py spec
59-
python main.py check --config secrets/config.json
60-
python main.py discover --config secrets/config.json
61-
python main.py read --config secrets/config.json --catalog integration_tests/configured_catalog.json
30+
poetry run source-bing-ads spec
31+
poetry run source-bing-ads check --config secrets/config.json
32+
poetry run source-bing-ads discover --config secrets/config.json
33+
poetry run source-bing-ads read --config secrets/config.json --catalog sample_files/configured_catalog.json
6234
```
6335

64-
### Locally running the connector docker image
65-
66-
67-
68-
#### Use `airbyte-ci` to build your connector
69-
The Airbyte way of building this connector is to use our `airbyte-ci` tool.
70-
You can follow install instructions [here](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md#L1).
71-
Then running the following command will build your connector:
36+
### Running unit tests
37+
To run unit tests locally, from the connector directory run:
38+
```
39+
poetry run pytest unit_tests
40+
```
7241

42+
### Building the docker image
43+
1. Install [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md)
44+
2. Run the following command to build the docker image:
7345
```bash
7446
airbyte-ci connectors --name=source-bing-ads build
7547
```
76-
Once the command is done, you will find your connector image in your local docker registry: `airbyte/source-bing-ads:dev`.
77-
78-
##### Customizing our build process
79-
When contributing on our connector you might need to customize the build process to add a system dependency or set an env var.
80-
You can customize our build process by adding a `build_customization.py` module to your connector.
81-
This module should contain a `pre_connector_install` and `post_connector_install` async function that will mutate the base image and the connector container respectively.
82-
It will be imported at runtime by our build process and the functions will be called if they exist.
8348

84-
Here is an example of a `build_customization.py` module:
85-
```python
86-
from __future__ import annotations
49+
An image will be available on your host with the tag `airbyte/source-bing-ads:dev`.
8750

88-
from typing import TYPE_CHECKING
8951

90-
if TYPE_CHECKING:
91-
# Feel free to check the dagger documentation for more information on the Container object and its methods.
92-
# https://dagger-io.readthedocs.io/en/sdk-python-v0.6.4/
93-
from dagger import Container
94-
95-
96-
async def pre_connector_install(base_image_container: Container) -> Container:
97-
return await base_image_container.with_env_variable("MY_PRE_BUILD_ENV_VAR", "my_pre_build_env_var_value")
98-
99-
async def post_connector_install(connector_container: Container) -> Container:
100-
return await connector_container.with_env_variable("MY_POST_BUILD_ENV_VAR", "my_post_build_env_var_value")
101-
```
102-
103-
#### Build your own connector image
104-
This connector is built using our dynamic built process in `airbyte-ci`.
105-
The base image used to build it is defined within the metadata.yaml file under the `connectorBuildOptions`.
106-
The build logic is defined using [Dagger](https://dagger.io/) [here](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/pipelines/builds/python_connectors.py).
107-
It does not rely on a Dockerfile.
108-
109-
If you would like to patch our connector and build your own a simple approach would be to:
110-
111-
1. Create your own Dockerfile based on the latest version of the connector image.
112-
```Dockerfile
113-
FROM airbyte/source-bing-ads:latest
114-
115-
COPY . ./airbyte/integration_code
116-
RUN pip install ./airbyte/integration_code
117-
118-
# The entrypoint and default env vars are already set in the base image
119-
# ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
120-
# ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
121-
```
122-
Please use this as an example. This is not optimized.
123-
124-
2. Build your image:
125-
```bash
126-
docker build -t airbyte/source-bing-ads:dev .
127-
# Running the spec command against your patched connector
128-
docker run airbyte/source-bing-ads:dev spec
129-
```
130-
#### Run
52+
### Running as a docker container
13153
Then run any of the connector commands as follows:
13254
```
13355
docker run --rm airbyte/source-bing-ads:dev spec
@@ -136,29 +58,34 @@ docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-bing-ads:dev discover
13658
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-bing-ads:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
13759
```
13860

139-
## Testing
61+
### Running our CI test suite
14062
You can run our full test suite locally using [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md):
14163
```bash
14264
airbyte-ci connectors --name=source-bing-ads test
14365
```
14466

14567
### Customizing acceptance Tests
146-
Customize `acceptance-test-config.yml` file to configure tests. See [Connector Acceptance Tests](https://docs.airbyte.com/connector-development/testing-connectors/connector-acceptance-tests-reference) for more information.
68+
Customize `acceptance-test-config.yml` file to configure acceptance tests. See [Connector Acceptance Tests](https://docs.airbyte.com/connector-development/testing-connectors/connector-acceptance-tests-reference) for more information.
14769
If your connector requires to create or destroy resources for use during acceptance tests create fixtures for it and place them inside integration_tests/acceptance.py.
14870

149-
## Dependency Management
150-
All of your dependencies should go in `setup.py`, NOT `requirements.txt`. The requirements file is only used to connect internal Airbyte dependencies in the monorepo for local development.
151-
We split dependencies between two groups, dependencies that are:
152-
* required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
153-
* required for the testing need to go to `TEST_REQUIREMENTS` list
71+
### Dependency Management
72+
All of your dependencies should be managed via Poetry.
73+
To add a new dependency, run:
74+
```bash
75+
poetry add <package-name>
76+
```
15477

155-
### Publishing a new version of the connector
78+
Please commit the changes to `pyproject.toml` and `poetry.lock` files.
79+
80+
## Publishing a new version of the connector
15681
You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?
15782
1. Make sure your changes are passing our test suite: `airbyte-ci connectors --name=source-bing-ads test`
158-
2. Bump the connector version in `metadata.yaml`: increment the `dockerImageTag` value. Please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors).
83+
2. Bump the connector version (please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors)):
84+
- bump the `dockerImageTag` value in in `metadata.yaml`
85+
- bump the `version` value in `pyproject.toml`
15986
3. Make sure the `metadata.yaml` content is up to date.
160-
4. Make the connector documentation and its changelog is up to date (`docs/integrations/sources/bing-ads.md`).
87+
4. Make sure the connector documentation and its changelog is up to date (`docs/integrations/sources/bing-ads.md`).
16188
5. Create a Pull Request: use [our PR naming conventions](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#pull-request-title-convention).
16289
6. Pat yourself on the back for being an awesome contributor.
16390
7. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
164-
91+
8. Once your PR is merged, the new version of the connector will be automatically published to Docker Hub and our connector registry.

airbyte-integrations/connectors/source-bing-ads/metadata.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ data:
1616
connectorSubtype: api
1717
connectorType: source
1818
definitionId: 47f25999-dd5e-4636-8c39-e7cea2453331
19-
dockerImageTag: 2.1.3
19+
dockerImageTag: 2.1.4
2020
dockerRepository: airbyte/source-bing-ads
2121
documentationUrl: https://docs.airbyte.com/integrations/sources/bing-ads
2222
githubIssueLabel: source-bing-ads

0 commit comments

Comments
 (0)