Skip to content

Commit

Permalink
Source openweather: Migrate to manifest-only (#44772)
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristoGrab authored Aug 27, 2024
1 parent 29404cf commit 392dcaf
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 1,197 deletions.
89 changes: 25 additions & 64 deletions airbyte-integrations/connectors/source-openweather/README.md
Original file line number Diff line number Diff line change
@@ -1,49 +1,22 @@
# Openweather source connector

This is the repository for the Openweather source connector, written in Python.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.com/integrations/sources/openweather).
This directory contains the manifest-only connector for `source-openweather`.
This _manifest-only_ connector is not a Python package on its own, as it runs inside of the base `source-declarative-manifest` image.

## Local development

### Prerequisites

- Python (~=3.9)
- Poetry (~=1.7) - installation instructions [here](https://python-poetry.org/docs/#installation)

### Installing the connector

From this connector directory, run:

```bash
poetry install --with dev
```

### Create credentials
For information about how to configure and use this connector within Airbyte, see [the connector's full documentation](https://docs.airbyte.com/integrations/sources/openweather).

**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/openweather)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_openweather/spec.yaml` file.
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
See `sample_files/sample_config.json` for a sample config file.

### Locally running the connector

```
poetry run source-openweather spec
poetry run source-openweather check --config secrets/config.json
poetry run source-openweather discover --config secrets/config.json
poetry run source-openweather read --config secrets/config.json --catalog sample_files/configured_catalog.json
```
## Local development

### Running unit tests
We recommend using the Connector Builder to edit this connector.
Using either Airbyte Cloud or your local Airbyte OSS instance, navigate to the **Builder** tab and select **Import a YAML**.
Then select the connector's `manifest.yaml` file to load the connector into the Builder. You're now ready to make changes to the connector!

To run unit tests locally, from the connector directory run:

```
poetry run pytest unit_tests
```
If you prefer to develop locally, you can follow the instructions below.

### Building the docker image

You can build any manifest-only connector with `airbyte-ci`:

1. Install [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md)
2. Run the following command to build the docker image:

Expand All @@ -53,52 +26,40 @@ airbyte-ci connectors --name=source-openweather build

An image will be available on your host with the tag `airbyte/source-openweather:dev`.

### Creating credentials

**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/openweather)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `spec` object in the connector's `manifest.yaml` file.
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.

### Running as a docker container

Then run any of the connector commands as follows:
Then run any of the standard source connector commands:

```
```bash
docker run --rm airbyte/source-openweather:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-openweather:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-openweather:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-openweather:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
```

### Running our CI test suite
### Running the CI test suite

You can run our full test suite locally using [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md):

```bash
airbyte-ci connectors --name=source-openweather test
```

### Customizing acceptance Tests

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.
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.

### Dependency Management

All of your dependencies should be managed via Poetry.
To add a new dependency, run:

```bash
poetry add <package-name>
```

Please commit the changes to `pyproject.toml` and `poetry.lock` files.

## Publishing a new version of the connector

You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?

1. Make sure your changes are passing our test suite: `airbyte-ci connectors --name=source-openweather test`
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)):
- bump the `dockerImageTag` value in in `metadata.yaml`
- bump the `version` value in `pyproject.toml`
3. Make sure the `metadata.yaml` content is up to date.
If you want to contribute changes to `source-openweather`, here's how you can do that:
1. Make your changes locally, or load the connector's manifest into Connector Builder and make changes there.
2. Make sure your changes are passing our test suite with `airbyte-ci connectors --name=source-openweather test`
3. 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)):
- bump the `dockerImageTag` value in in `metadata.yaml`
4. Make sure the connector documentation and its changelog is up to date (`docs/integrations/sources/openweather.md`).
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).
6. Pat yourself on the back for being an awesome contributor.
7. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
8. Once your PR is merged, the new version of the connector will be automatically published to Docker Hub and our connector registry.
8. Once your PR is merged, the new version of the connector will be automatically published to Docker Hub and our connector registry.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# for more information about how to configure these tests
connector_image: airbyte/source-openweather:dev
acceptance_tests:
spec:
tests:
- spec_path: "manifest.yaml"
connection:
tests:
- config_path: "secrets/config.json"
Expand Down
8 changes: 0 additions & 8 deletions airbyte-integrations/connectors/source-openweather/main.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 0.79.1
version: 4.5.4

type: DeclarativeSource

Expand Down Expand Up @@ -135,22 +135,22 @@ spec:
order: 1
lat:
type: string
pattern: ^[-]?\d{1,2}(\.\d+)?$
description: >-
Latitude, decimal (-90; 90). If you need the geocoder to automatic
convert city names and zip-codes to geo coordinates and the other way
around, please use our Geocoding API
pattern: ^[-]?\d{1,2}(\.\d+)?$
examples:
- "45.7603"
- "-21.249107858038816"
order: 2
lon:
type: string
pattern: ^[-]?\d{1,2}(\.\d+)?$
description: >-
Longitude, decimal (-180; 180). If you need the geocoder to automatic
convert city names and zip-codes to geo coordinates and the other way
around, please use our Geocoding API
pattern: ^[-]?\d{1,2}(\.\d+)?$
examples:
- "4.835659"
- "-70.39482074115321"
Expand Down Expand Up @@ -178,10 +178,6 @@ spec:
order: 5
additionalProperties: true

metadata:
autoImportSchema:
onecall: false

schemas:
onecall:
type: object
Expand All @@ -193,8 +189,8 @@ schemas:
description: Weather alerts for the requested location
current:
type: object
additionalProperties: true
description: Contains current weather data
additionalProperties: true
properties:
clouds:
type: number
Expand All @@ -216,8 +212,8 @@ schemas:
description: Atmospheric pressure on the sea level
rain:
type: object
additionalProperties: true
description: Information about precipitation in the last hour
additionalProperties: true
properties:
1h:
type: number
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ data:
hosts:
- api.openweathermap.org
connectorBuildOptions:
baseImage: docker.io/airbyte/python-connector-base:2.0.0@sha256:c44839ba84406116e8ba68722a0f30e8f6e7056c726f447681bb9e9ece8bd916
baseImage: docker.io/airbyte/source-declarative-manifest:4.5.4@sha256:b07a521add11f987c63c0db68c1b57e90bec0c985f1cb6f3c5a1940cde628a70
connectorSubtype: api
connectorType: source
definitionId: 561d7787-b45e-4f3b-af58-0163c3ba9d5a
dockerImageTag: 0.2.17
dockerImageTag: 0.3.0
dockerRepository: airbyte/source-openweather
documentationUrl: https://docs.airbyte.com/integrations/sources/openweather
githubIssueLabel: source-openweather
Expand All @@ -22,12 +22,12 @@ data:
releaseStage: alpha
remoteRegistries:
pypi:
enabled: true
enabled: false
packageName: airbyte-source-openweather
supportLevel: community
tags:
- language:python
- cdk:low-code
- language:manifest-only
connectorTestSuitesOptions:
- suite: liveTests
testConnections:
Expand Down
Loading

0 comments on commit 392dcaf

Please sign in to comment.