Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Source: Commcare #20220

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
3f4e418
commcare connector
siddhant3030 Dec 8, 2022
ec25bec
flake improvement
siddhant3030 Dec 8, 2022
a0d5249
added the docs
siddhant3030 Dec 8, 2022
63a3aa2
added the config
siddhant3030 Dec 8, 2022
c68c2c0
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 8, 2022
d9ed02d
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 8, 2022
4aa9938
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 8, 2022
c97912f
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 12, 2022
254c56e
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 12, 2022
b24c158
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 14, 2022
1c74e2f
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 14, 2022
8fd4965
Merge branch 'master' into feature/source-commcare-connector
sajarin Dec 14, 2022
d4edcc5
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 15, 2022
5123b12
Merge branch 'master' into feature/source-commcare-connector
sajarin Dec 15, 2022
5cffa0f
Merge branch 'master' into feature/source-commcare-connector
sajarin Dec 16, 2022
703af7a
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 16, 2022
686f180
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 17, 2022
4e59508
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 18, 2022
6655cc5
Merge branch 'master' into feature/source-commcare-connector
sajarin Dec 19, 2022
85bac0d
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 20, 2022
973781a
project_space added in the config
siddhant3030 Dec 20, 2022
3950f9a
project space is required
siddhant3030 Dec 20, 2022
73e4c99
cleaning
siddhant3030 Dec 20, 2022
bf4180e
added test case
siddhant3030 Dec 20, 2022
f9e1924
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 20, 2022
27241e4
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 21, 2022
280e1cd
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 22, 2022
98cc629
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Dec 26, 2022
74bbe11
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Jan 2, 2023
3adc306
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Jan 2, 2023
6398f33
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Jan 3, 2023
5a81eae
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Jan 5, 2023
ca2e874
Merge branch 'master' into feature/source-commcare-connector
sajarin Jan 5, 2023
f8650ab
Merge branch 'master' into feature/source-commcare-connector
sajarin Jan 5, 2023
ac117fb
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Jan 5, 2023
75e433f
Merge branch 'master' into feature/source-commcare-connector
sajarin Jan 5, 2023
da491c1
Merge branch 'master' into feature/source-commcare-connector
sajarin Jan 5, 2023
d7e124a
disbaled the backward compatibility test
siddhant3030 Jan 5, 2023
a2500b9
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Jan 5, 2023
0afbe16
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Jan 5, 2023
604f2db
Merge branch 'master' into feature/source-commcare-connector
siddhant3030 Jan 5, 2023
3546eb8
feat: revert .vscode/settings.json
sajarin Jan 5, 2023
c116193
auto-bump connector version
octavia-squidington-iii Jan 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,13 @@
documentationUrl: https://docs.airbyte.com/integrations/sources/convertkit
sourceType: api
releaseStage: alpha
- name: Commcare
sourceDefinitionId: f39208dc-7e1c-48b8-919b-5006360cc27f
dockerRepository: airbyte/source-commcare
dockerImageTag: 0.1.0
documentationUrl: https://docs.airbyte.com/integrations/sources/commcare
sourceType: api
releaseStage: alpha
- name: Copper
sourceDefinitionId: 44f3002f-2df9-4f6d-b21c-02cd3b47d0dc
dockerRepository: airbyte/source-copper
Expand Down
40 changes: 40 additions & 0 deletions airbyte-config/init/src/main/resources/seed/source_specs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2799,6 +2799,46 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-commcare:0.1.0"
spec:
documentationUrl: "https://docsurl.com"
connectionSpecification:
$schema: "http://json-schema.org/draft-07/schema#"
title: "Commcare Source Spec"
type: "object"
required:
- "api_key"
- "app_id"
- "start_date"
properties:
api_key:
type: "string"
title: "API Key"
description: "Commcare API Key"
airbyte_secret: true
order: 0
project_space:
type: "string"
title: "Project Space"
description: "Project Space for commcare"
order: 1
app_id:
type: "string"
title: "Application ID"
description: "The Application ID we are interested in"
airbyte_secret: true
order: 2
start_date:
type: "string"
title: "Start date for extracting records"
pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$"
default: "2022-10-01T00:00:00Z"
description: "UTC date and time in the format 2017-01-25T00:00:00Z. Only\
\ records after this date will be replicated."
order: 3
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-copper:0.1.0"
spec:
documentationUrl: "https://docs.airbyte.com/integrations/sources/copper"
Expand Down
6 changes: 6 additions & 0 deletions airbyte-integrations/connectors/source-commcare/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*
!Dockerfile
!main.py
!source_commcare
!setup.py
!secrets
39 changes: 39 additions & 0 deletions airbyte-integrations/connectors/source-commcare/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
FROM python:3.9.15-slim-bullseye as base

# build and load all requirements
FROM base as builder
WORKDIR /airbyte/integration_code

# upgrade pip to the latest version
RUN apt-get update && apt-get install -y && rm -rf /var/lib/apt/lists/* \
&& pip install --upgrade pip \
&& python3 -m pip install --upgrade setuptools

RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata

COPY setup.py ./
# install necessary packages to a temporary folder
RUN pip install --prefix=/install .

# build a clean environment
FROM base
WORKDIR /airbyte/integration_code

# copy all loaded and built libraries to a pure basic image
COPY --from=builder /install /usr/local
# add default timezone settings
COPY --from=builder /usr/share/zoneinfo/Etc/UTC /etc/localtime
RUN echo "Etc/UTC" > /etc/timezone

# bash is installed for more convenient debugging.
# RUN apk --no-cache add bash

# copy payload code only
COPY main.py ./
COPY source_commcare ./source_commcare

ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.1.0
LABEL io.airbyte.name=airbyte/source-commcare
132 changes: 132 additions & 0 deletions airbyte-integrations/connectors/source-commcare/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# Commcare Source

This is the repository for the Commcare source connector, written in Python.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/commcare).

## Local development

### Prerequisites
**To iterate on this connector, make sure to complete this prerequisites section.**

#### Minimum Python version required `= 3.9.0`

#### Build & Activate Virtual Environment and install dependencies
From this connector directory, create a virtual environment:
```
python -m venv .venv
```

This will generate a virtualenv for this module in `.venv/`. Make sure this venv is active in your
development environment of choice. To activate it from the terminal, run:
```
source .venv/bin/activate
pip install -r requirements.txt
pip install '.[tests]'
```
If you are in an IDE, follow your IDE's instructions to activate the virtualenv.

Note that while we are installing dependencies from `requirements.txt`, you should only edit `setup.py` for your dependencies. `requirements.txt` is
used for editable installs (`pip install -e`) to pull in Python dependencies from the monorepo and will call `setup.py`.
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
should work as you expect.

#### Building via Gradle
You can also build the connector in Gradle. This is typically used in CI and not needed for your development workflow.

To build using Gradle, from the Airbyte repository root, run:
```
./gradlew :airbyte-integrations:connectors:source-commcare:build
```

#### Create credentials
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/commcare)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_commcare/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 `integration_tests/sample_config.json` for a sample config file.

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

### Locally running the connector
```
python main.py spec
python main.py check --config secrets/config.json
python main.py discover --config secrets/config.json
python main.py read --config secrets/config.json --catalog integration_tests/configured_catalog.json
```

### Locally running the connector docker image

#### Build
First, make sure you build the latest Docker image:
```
docker build . -t airbyte/source-commcare:dev
```

You can also build the connector image via Gradle:
```
./gradlew :airbyte-integrations:connectors:source-commcare:airbyteDocker
```
When building via Gradle, the docker image name and tag, respectively, are the values of the `io.airbyte.name` and `io.airbyte.version` `LABEL`s in
the Dockerfile.

#### Run
Then run any of the connector commands as follows:
```
docker run --rm airbyte/source-commcare:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-commcare:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-commcare:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-commcare:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
```
## Testing
Make sure to familiarize yourself with [pytest test discovery](https://docs.pytest.org/en/latest/goodpractices.html#test-discovery) to know how your test files and methods should be named.
First install test dependencies into your virtual environment:
```
pip install .[tests]
```
### Unit Tests
To run unit tests locally, from the connector directory run:
```
python -m pytest unit_tests
```

### Integration Tests
There are two types of integration tests: Acceptance Tests (Airbyte's test suite for all source connectors) and custom integration tests (which are specific to this connector).
#### Custom Integration tests
Place custom tests inside `integration_tests/` folder, then, from the connector root, run
```
python -m pytest integration_tests
```
#### Acceptance Tests
Customize `acceptance-test-config.yml` file to configure tests. See [Source Acceptance Tests](https://docs.airbyte.io/connector-development/testing-connectors/source-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.
To run your integration tests with acceptance tests, from the connector root, run
```
python -m pytest integration_tests -p integration_tests.acceptance
```
To run your integration tests with docker

### Using gradle to run tests
All commands should be run from airbyte project root.
To run unit tests:
```
./gradlew :airbyte-integrations:connectors:source-commcare:unitTest
```
To run acceptance and custom integration tests:
```
./gradlew :airbyte-integrations:connectors:source-commcare:integrationTest
```

## Dependency Management
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.
We split dependencies between two groups, dependencies that are:
* required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
* required for the testing need to go to `TEST_REQUIREMENTS` list

### 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 unit and integration tests.
1. Bump the connector version in `Dockerfile` -- just increment the value of the `LABEL io.airbyte.version` appropriately (we use [SemVer](https://semver.org/)).
1. Create a Pull Request.
1. Pat yourself on the back for being an awesome contributor.
1. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# See [Source Acceptance Tests](https://docs.airbyte.io/connector-development/testing-connectors/source-acceptance-tests-reference)
# for more information about how to configure these tests
connector_image: airbyte/source-commcare:dev
tests:
spec:
- spec_path: "source_commcare/spec.yaml"
connection:
- config_path: "secrets/config.json"
status: "succeed"
- config_path: "integration_tests/invalid_config.json"
status: "failed"
# discovery:
# - config_path: "secrets/config.json"
# backward_compatibility_tests_config:
# disable_for_version: "0.1.0"
basic_read:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
empty_streams: []
full_refresh:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
incremental:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
future_state_path: "integration_tests/abnormal_state.json"
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env sh

# Build latest connector image
docker build . -t $(cat acceptance-test-config.yml | grep "connector_image" | head -n 1 | cut -d: -f2-)

# Pull latest acctest image
docker pull airbyte/source-acceptance-test:latest

# Run
docker run --rm -it \
-v /var/run/docker.sock:/var/run/docker.sock \
-v /tmp:/tmp \
-v $(pwd):/test_input \
airbyte/source-acceptance-test \
--acceptance-test-config /test_input

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
plugins {
id 'airbyte-python'
id 'airbyte-docker'
id 'airbyte-source-acceptance-test'
}

airbytePython {
moduleDirectory 'source_commcare'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
#
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Assess a referred patient": {
"indexed_on": "2023-11-25T20:30:30.2423"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
#


import pytest

pytest_plugins = ("source_acceptance_test.plugin",)


@pytest.fixture(scope="session", autouse=True)
def connector_setup():
"""This fixture is a placeholder for external resources that acceptance test might require."""
# TODO: setup test dependencies if needed. otherwise remove the TODO comments
yield
# TODO: clean up test dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"streams": [
{
"stream": {
"name": "Assess a referred patient",
"json_schema": {},
"supported_sync_modes": [
"full_refresh",
"incremental"
],
"source_defined_cursor": true,
"default_cursor_field": [
"indexed_on"
]
},
"sync_mode": "incremental",
"cursor_field": [
"indexed_on"
],
"destination_sync_mode": "append"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"app_id": "wrong app_id",
"api_key": "wrong api key",
"start_date": "This has the wrong format",
"project_space": "project_space"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"app_id": "App ID",
"api_key": "API KEY",
"project_space": "project_space",
"start_date": "Start Date"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"todo-stream-name": {
"todo-field-name": "value"
}
}
13 changes: 13 additions & 0 deletions airbyte-integrations/connectors/source-commcare/main.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
#


import sys

from airbyte_cdk.entrypoint import launch
from source_commcare import SourceCommcare

if __name__ == "__main__":
source = SourceCommcare()
launch(source, sys.argv[1:])
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-e ../../bases/source-acceptance-test
-e .
Loading