source-apify-dataset: ensure inline schemas, updated cdk, poetry (where possible) (#37115)

Author: bleonard

airbyte-integrations/connectors/source-apify-dataset/Dockerfile

@@ -1,105 +1,91 @@
-# Apify Dataset Source
+# Apify-Dataset source connector
 
-This is the repository for the Apify Dataset configuration based source connector.
+
+This is the repository for the Apify-Dataset source connector, written in Python.
 For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.com/integrations/sources/apify-dataset).
 
 ## Local development
 
-#### Building via Python
-
-Create a Python virtual environment
-
-```
-virtualenv --python $(which python3.10) .venv
-```
+### Prerequisites
+* Python (~=3.9)
+* Poetry (~=1.7) - installation instructions [here](https://python-poetry.org/docs/#installation)
 
-Source it
 
-```
-source .venv/bin/activate
+### Installing the connector
+From this connector directory, run:
+```bash
+poetry install --with dev
 ```
 
-Check connector specifications/definition
 
-```
-python main.py spec
-```
+### Create credentials
+**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/apify-dataset)
+to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_apify_dataset/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.
 
-Basic check - check connection to the API
 
+### Locally running the connector
 ```
-python main.py check --config secrets/config.json
+poetry run source-apify-dataset spec
+poetry run source-apify-dataset check --config secrets/config.json
+poetry run source-apify-dataset discover --config secrets/config.json
+poetry run source-apify-dataset read --config secrets/config.json --catalog sample_files/configured_catalog.json
 ```
 
-Integration tests - read operation from the API
-
+### Running unit tests
+To run unit tests locally, from the connector directory run:
 ```
-python main.py read --config secrets/config.json --catalog integration_tests/configured_catalog.json
+poetry run pytest unit_tests
 ```
 
-#### Create credentials
-
-**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/apify-dataset)
-to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_apify_dataset/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 apify-dataset test creds`
-and place them into `secrets/config.json`.
-
-### Locally running the connector docker image
-
-
-#### Build
-**Via [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md) (recommended):**
+### Building the docker image
+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:
 ```bash
 airbyte-ci connectors --name=source-apify-dataset build
 ```
 
-An image will be built with the tag `airbyte/source-apify-dataset:dev`.
+An image will be available on your host with the tag `airbyte/source-apify-dataset:dev`.
 
-**Via `docker build`:**
-```bash
-docker build -t airbyte/source-apify-dataset:dev .
-```
-
-#### Run
 
+### Running as a docker container
 Then run any of the connector commands as follows:
-
 ```
 docker run --rm airbyte/source-apify-dataset:dev spec
 docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-apify-dataset:dev check --config /secrets/config.json
 docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-apify-dataset:dev discover --config /secrets/config.json
 docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-apify-dataset:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
 ```
 
-
-## Testing
+### Running our 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-apify-dataset test
 ```
 
 ### Customizing acceptance Tests
-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.
+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 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:
+### Dependency Management
+All of your dependencies should be managed via Poetry. 
+To add a new dependency, run:
+```bash
+poetry add <package-name>
+```
 
-- required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
-- required for the testing need to go to `TEST_REQUIREMENTS` list
+Please commit the changes to `pyproject.toml` and `poetry.lock` files.
 
-### Publishing a new version of the connector
+## 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-apify-dataset test`
-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).
+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.
-4. Make the connector documentation and its changelog is up to date (`docs/integrations/sources/apify-dataset.md`).
+4. Make sure the connector documentation and its changelog is up to date (`docs/integrations/sources/apify-dataset.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.

airbyte-integrations/connectors/source-apify-dataset/README.md

@@ -2,36 +2,41 @@ data:
   allowedHosts:
     hosts:
       - api.apify.com
-  remoteRegistries:
-    pypi:
-      enabled: true
-      packageName: airbyte-source-apify-dataset
-  registries:
-    oss:
-      enabled: true
-    cloud:
-      enabled: true
+  connectorBuildOptions:
+    baseImage: docker.io/airbyte/python-connector-base:1.2.0@sha256:c22a9d97464b69d6ef01898edf3f8612dc11614f05a84984451dde195f337db9
   connectorSubtype: api
   connectorType: source
   definitionId: 47f17145-fe20-4ef5-a548-e29b048adf84
-  dockerImageTag: 2.1.1
+  dockerImageTag: 2.1.5
   dockerRepository: airbyte/source-apify-dataset
+  documentationUrl: https://docs.airbyte.com/integrations/sources/apify-dataset
   githubIssueLabel: source-apify-dataset
   icon: apify.svg
   license: MIT
   name: Apify Dataset
+  registries:
+    cloud:
+      enabled: true
+    oss:
+      enabled: true
   releaseDate: 2023-08-25
   releaseStage: alpha
   releases:
     breakingChanges:
       1.0.0:
+        message: Update spec to use token and ingest all 3 streams correctly
         upgradeDeadline: 2023-08-30
-        message: "Update spec to use token and ingest all 3 streams correctly"
       2.0.0:
+        message:
+          This version introduces a new Item Collection (WCC) stream as a substitute
+          of the now-removed Item Collection stream in order to retain data for Web-Content-Crawler
+          datasets.
         upgradeDeadline: 2023-09-18
-        message: "This version introduces a new Item Collection (WCC) stream as a substitute of the now-removed Item Collection stream in order to retain data for Web-Content-Crawler datasets."
+  remoteRegistries:
+    pypi:
+      enabled: true
+      packageName: airbyte-source-apify-dataset
   supportLevel: community
-  documentationUrl: https://docs.airbyte.com/integrations/sources/apify-dataset
   tags:
     - language:python
     - cdk:low-code