From 584d5d629442bb2ee7eb5d40235b0ea5c9d9d6ca Mon Sep 17 00:00:00 2001 From: Joseph Shearer Date: Fri, 16 Feb 2024 15:37:00 -0500 Subject: [PATCH 1/2] fix: Python packages broke when introducing `source-hubspot`, this fixes all python packages --- python/Dockerfile | 1 - source-hubspot/__init__.py | 0 source-hubspot/__main__.py | 2 +- source-hubspot/source_hubspot/source.py | 4 +++- source-hubspot/source_hubspot/streams.py | 6 +++--- source-hubspot/{source_hubspot => }/spec.yaml | 0 6 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 source-hubspot/__init__.py rename source-hubspot/{source_hubspot => }/spec.yaml (100%) diff --git a/python/Dockerfile b/python/Dockerfile index c956429380..bfa6e8b1c4 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -59,7 +59,6 @@ WORKDIR /connector COPY --from=builder /builder/connector ./$CONNECTOR_NAME COPY --from=builder /builder/python ./python -ENV PYTHONPATH="/connector/$CONNECTOR_NAME" # Arg substitution in CMD doesn't seem to work ENV CONNECTOR_NAME=$CONNECTOR_NAME CMD python -m $CONNECTOR_NAME \ No newline at end of file diff --git a/source-hubspot/__init__.py b/source-hubspot/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/source-hubspot/__main__.py b/source-hubspot/__main__.py index dd4a4c8b0b..7ef5694e42 100644 --- a/source-hubspot/__main__.py +++ b/source-hubspot/__main__.py @@ -1,6 +1,6 @@ import urllib from flow_sdk import shim_airbyte_cdk -from source_hubspot import SourceHubspot +from .source_hubspot import SourceHubspot scopes = [ "forms", diff --git a/source-hubspot/source_hubspot/source.py b/source-hubspot/source_hubspot/source.py index 1e4d22cad6..5f5a3984e7 100644 --- a/source-hubspot/source_hubspot/source.py +++ b/source-hubspot/source_hubspot/source.py @@ -4,6 +4,7 @@ import logging from itertools import chain +from pathlib import Path from typing import Any, List, Mapping, Optional, Tuple import requests @@ -11,7 +12,7 @@ from airbyte_cdk.sources import AbstractSource from airbyte_cdk.sources.streams import Stream from requests import HTTPError -from source_hubspot.streams import ( +from .streams import ( API, Campaigns, Companies, @@ -45,6 +46,7 @@ ) + class SourceHubspot(AbstractSource): logger = logging.getLogger('hubspot') diff --git a/source-hubspot/source_hubspot/streams.py b/source-hubspot/source_hubspot/streams.py index bfba8fe7c3..81343b9c14 100644 --- a/source-hubspot/source_hubspot/streams.py +++ b/source-hubspot/source_hubspot/streams.py @@ -25,9 +25,9 @@ from airbyte_cdk.sources.streams.http.requests_native_auth import Oauth2Authenticator, TokenAuthenticator from airbyte_cdk.sources.utils.transform import TransformConfig, TypeTransformer from requests import HTTPError, codes -from source_hubspot.constants import OAUTH_CREDENTIALS, PRIVATE_APP_CREDENTIALS -from source_hubspot.errors import HubspotAccessDenied, HubspotInvalidAuth, HubspotRateLimited, HubspotTimeout, InvalidStartDateConfigError -from source_hubspot.helpers import APIv1Property, APIv3Property, GroupByKey, IRecordPostProcessor, IURLPropertyRepresentation, StoreAsIs +from .constants import OAUTH_CREDENTIALS, PRIVATE_APP_CREDENTIALS +from .errors import HubspotAccessDenied, HubspotInvalidAuth, HubspotRateLimited, HubspotTimeout, InvalidStartDateConfigError +from .helpers import APIv1Property, APIv3Property, GroupByKey, IRecordPostProcessor, IURLPropertyRepresentation, StoreAsIs # we got this when provided API Token has incorrect format CLOUDFLARE_ORIGIN_DNS_ERROR = 530 diff --git a/source-hubspot/source_hubspot/spec.yaml b/source-hubspot/spec.yaml similarity index 100% rename from source-hubspot/source_hubspot/spec.yaml rename to source-hubspot/spec.yaml From d92eb2d5496e2c90fb37d4c53b9349347efd8fcc Mon Sep 17 00:00:00 2001 From: Joseph Shearer Date: Fri, 16 Feb 2024 15:46:54 -0500 Subject: [PATCH 2/2] fix: Airbyte also expects the `schemas` folder to be in the root of the package --- source-hubspot/{source_hubspot => }/schemas/campaigns.json | 0 source-hubspot/{source_hubspot => }/schemas/companies.json | 0 source-hubspot/{source_hubspot => }/schemas/contact_lists.json | 0 source-hubspot/{source_hubspot => }/schemas/contacts.json | 0 .../{source_hubspot => }/schemas/contacts_list_memberships.json | 0 source-hubspot/{source_hubspot => }/schemas/deal_pipelines.json | 0 source-hubspot/{source_hubspot => }/schemas/deals.json | 0 source-hubspot/{source_hubspot => }/schemas/deals_archived.json | 0 source-hubspot/{source_hubspot => }/schemas/email_events.json | 0 .../{source_hubspot => }/schemas/email_subscriptions.json | 0 source-hubspot/{source_hubspot => }/schemas/engagements.json | 0 .../{source_hubspot => }/schemas/engagements_calls.json | 0 .../{source_hubspot => }/schemas/engagements_emails.json | 0 .../{source_hubspot => }/schemas/engagements_meetings.json | 0 .../{source_hubspot => }/schemas/engagements_notes.json | 0 .../{source_hubspot => }/schemas/engagements_tasks.json | 0 .../{source_hubspot => }/schemas/feedback_submissions.json | 0 source-hubspot/{source_hubspot => }/schemas/form_submissions.json | 0 source-hubspot/{source_hubspot => }/schemas/forms.json | 0 source-hubspot/{source_hubspot => }/schemas/goals.json | 0 source-hubspot/{source_hubspot => }/schemas/line_items.json | 0 source-hubspot/{source_hubspot => }/schemas/marketing_emails.json | 0 source-hubspot/{source_hubspot => }/schemas/owners.json | 0 source-hubspot/{source_hubspot => }/schemas/products.json | 0 source-hubspot/{source_hubspot => }/schemas/property_history.json | 0 .../{source_hubspot => }/schemas/subscription_changes.json | 0 source-hubspot/{source_hubspot => }/schemas/ticket_pipelines.json | 0 source-hubspot/{source_hubspot => }/schemas/tickets.json | 0 source-hubspot/{source_hubspot => }/schemas/workflows.json | 0 29 files changed, 0 insertions(+), 0 deletions(-) rename source-hubspot/{source_hubspot => }/schemas/campaigns.json (100%) rename source-hubspot/{source_hubspot => }/schemas/companies.json (100%) rename source-hubspot/{source_hubspot => }/schemas/contact_lists.json (100%) rename source-hubspot/{source_hubspot => }/schemas/contacts.json (100%) rename source-hubspot/{source_hubspot => }/schemas/contacts_list_memberships.json (100%) rename source-hubspot/{source_hubspot => }/schemas/deal_pipelines.json (100%) rename source-hubspot/{source_hubspot => }/schemas/deals.json (100%) rename source-hubspot/{source_hubspot => }/schemas/deals_archived.json (100%) rename source-hubspot/{source_hubspot => }/schemas/email_events.json (100%) rename source-hubspot/{source_hubspot => }/schemas/email_subscriptions.json (100%) rename source-hubspot/{source_hubspot => }/schemas/engagements.json (100%) rename source-hubspot/{source_hubspot => }/schemas/engagements_calls.json (100%) rename source-hubspot/{source_hubspot => }/schemas/engagements_emails.json (100%) rename source-hubspot/{source_hubspot => }/schemas/engagements_meetings.json (100%) rename source-hubspot/{source_hubspot => }/schemas/engagements_notes.json (100%) rename source-hubspot/{source_hubspot => }/schemas/engagements_tasks.json (100%) rename source-hubspot/{source_hubspot => }/schemas/feedback_submissions.json (100%) rename source-hubspot/{source_hubspot => }/schemas/form_submissions.json (100%) rename source-hubspot/{source_hubspot => }/schemas/forms.json (100%) rename source-hubspot/{source_hubspot => }/schemas/goals.json (100%) rename source-hubspot/{source_hubspot => }/schemas/line_items.json (100%) rename source-hubspot/{source_hubspot => }/schemas/marketing_emails.json (100%) rename source-hubspot/{source_hubspot => }/schemas/owners.json (100%) rename source-hubspot/{source_hubspot => }/schemas/products.json (100%) rename source-hubspot/{source_hubspot => }/schemas/property_history.json (100%) rename source-hubspot/{source_hubspot => }/schemas/subscription_changes.json (100%) rename source-hubspot/{source_hubspot => }/schemas/ticket_pipelines.json (100%) rename source-hubspot/{source_hubspot => }/schemas/tickets.json (100%) rename source-hubspot/{source_hubspot => }/schemas/workflows.json (100%) diff --git a/source-hubspot/source_hubspot/schemas/campaigns.json b/source-hubspot/schemas/campaigns.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/campaigns.json rename to source-hubspot/schemas/campaigns.json diff --git a/source-hubspot/source_hubspot/schemas/companies.json b/source-hubspot/schemas/companies.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/companies.json rename to source-hubspot/schemas/companies.json diff --git a/source-hubspot/source_hubspot/schemas/contact_lists.json b/source-hubspot/schemas/contact_lists.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/contact_lists.json rename to source-hubspot/schemas/contact_lists.json diff --git a/source-hubspot/source_hubspot/schemas/contacts.json b/source-hubspot/schemas/contacts.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/contacts.json rename to source-hubspot/schemas/contacts.json diff --git a/source-hubspot/source_hubspot/schemas/contacts_list_memberships.json b/source-hubspot/schemas/contacts_list_memberships.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/contacts_list_memberships.json rename to source-hubspot/schemas/contacts_list_memberships.json diff --git a/source-hubspot/source_hubspot/schemas/deal_pipelines.json b/source-hubspot/schemas/deal_pipelines.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/deal_pipelines.json rename to source-hubspot/schemas/deal_pipelines.json diff --git a/source-hubspot/source_hubspot/schemas/deals.json b/source-hubspot/schemas/deals.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/deals.json rename to source-hubspot/schemas/deals.json diff --git a/source-hubspot/source_hubspot/schemas/deals_archived.json b/source-hubspot/schemas/deals_archived.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/deals_archived.json rename to source-hubspot/schemas/deals_archived.json diff --git a/source-hubspot/source_hubspot/schemas/email_events.json b/source-hubspot/schemas/email_events.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/email_events.json rename to source-hubspot/schemas/email_events.json diff --git a/source-hubspot/source_hubspot/schemas/email_subscriptions.json b/source-hubspot/schemas/email_subscriptions.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/email_subscriptions.json rename to source-hubspot/schemas/email_subscriptions.json diff --git a/source-hubspot/source_hubspot/schemas/engagements.json b/source-hubspot/schemas/engagements.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/engagements.json rename to source-hubspot/schemas/engagements.json diff --git a/source-hubspot/source_hubspot/schemas/engagements_calls.json b/source-hubspot/schemas/engagements_calls.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/engagements_calls.json rename to source-hubspot/schemas/engagements_calls.json diff --git a/source-hubspot/source_hubspot/schemas/engagements_emails.json b/source-hubspot/schemas/engagements_emails.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/engagements_emails.json rename to source-hubspot/schemas/engagements_emails.json diff --git a/source-hubspot/source_hubspot/schemas/engagements_meetings.json b/source-hubspot/schemas/engagements_meetings.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/engagements_meetings.json rename to source-hubspot/schemas/engagements_meetings.json diff --git a/source-hubspot/source_hubspot/schemas/engagements_notes.json b/source-hubspot/schemas/engagements_notes.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/engagements_notes.json rename to source-hubspot/schemas/engagements_notes.json diff --git a/source-hubspot/source_hubspot/schemas/engagements_tasks.json b/source-hubspot/schemas/engagements_tasks.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/engagements_tasks.json rename to source-hubspot/schemas/engagements_tasks.json diff --git a/source-hubspot/source_hubspot/schemas/feedback_submissions.json b/source-hubspot/schemas/feedback_submissions.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/feedback_submissions.json rename to source-hubspot/schemas/feedback_submissions.json diff --git a/source-hubspot/source_hubspot/schemas/form_submissions.json b/source-hubspot/schemas/form_submissions.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/form_submissions.json rename to source-hubspot/schemas/form_submissions.json diff --git a/source-hubspot/source_hubspot/schemas/forms.json b/source-hubspot/schemas/forms.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/forms.json rename to source-hubspot/schemas/forms.json diff --git a/source-hubspot/source_hubspot/schemas/goals.json b/source-hubspot/schemas/goals.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/goals.json rename to source-hubspot/schemas/goals.json diff --git a/source-hubspot/source_hubspot/schemas/line_items.json b/source-hubspot/schemas/line_items.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/line_items.json rename to source-hubspot/schemas/line_items.json diff --git a/source-hubspot/source_hubspot/schemas/marketing_emails.json b/source-hubspot/schemas/marketing_emails.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/marketing_emails.json rename to source-hubspot/schemas/marketing_emails.json diff --git a/source-hubspot/source_hubspot/schemas/owners.json b/source-hubspot/schemas/owners.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/owners.json rename to source-hubspot/schemas/owners.json diff --git a/source-hubspot/source_hubspot/schemas/products.json b/source-hubspot/schemas/products.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/products.json rename to source-hubspot/schemas/products.json diff --git a/source-hubspot/source_hubspot/schemas/property_history.json b/source-hubspot/schemas/property_history.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/property_history.json rename to source-hubspot/schemas/property_history.json diff --git a/source-hubspot/source_hubspot/schemas/subscription_changes.json b/source-hubspot/schemas/subscription_changes.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/subscription_changes.json rename to source-hubspot/schemas/subscription_changes.json diff --git a/source-hubspot/source_hubspot/schemas/ticket_pipelines.json b/source-hubspot/schemas/ticket_pipelines.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/ticket_pipelines.json rename to source-hubspot/schemas/ticket_pipelines.json diff --git a/source-hubspot/source_hubspot/schemas/tickets.json b/source-hubspot/schemas/tickets.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/tickets.json rename to source-hubspot/schemas/tickets.json diff --git a/source-hubspot/source_hubspot/schemas/workflows.json b/source-hubspot/schemas/workflows.json similarity index 100% rename from source-hubspot/source_hubspot/schemas/workflows.json rename to source-hubspot/schemas/workflows.json