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

Connector Facebook-Marketing: update insights streams with custom entries for fields, breakdowns and action_breakdowns #4864

Closed
Show file tree
Hide file tree
Changes from 8 commits
Commits
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 @@ -2,9 +2,12 @@
# Copyright (c) 2021 Airbyte, Inc., all rights reserved.
#

import json
from datetime import datetime
from typing import Any, List, Mapping, Tuple, Type
from typing import Any, List, Mapping, Optional, Tuple, Type

from airbyte_cdk.entrypoint import logger
from airbyte_cdk.logger import AirbyteLogger
from airbyte_cdk.models import AuthSpecification, ConnectorSpecification, DestinationSyncMode, OAuth2Specification
from airbyte_cdk.sources import AbstractSource
from airbyte_cdk.sources.streams import Stream
Expand All @@ -25,6 +28,17 @@
)


class InsightConfig(BaseModel):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vladimir-remar did you validate that the json output by spec works with the UI via the instructions here? Just checking because I don't remember if we support a list of objects

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sherifnada we do actually :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sherifnada thanks to @keu, I attached some images from UI
Screenshot from 2021-10-14 11-40-23
It will be filled like this
Screenshot from 2021-10-14 11-42-16
And it will look like this with two elements
Screenshot from 2021-10-14 11-42-50
and from destination side
Screenshot from 2021-10-14 11-44-12


name: str = Field(description="The name value of insight")

fields: Optional[List[str]] = Field(description="A list of chosen fields for fields parameter")

breakdowns: Optional[List[str]] = Field(description="A list of chosen breakdowns for breakdowns")

action_breakdowns: Optional[List[str]] = Field(description="A list of chosen action_breakdowns for action_breakdowns")


class ConnectorConfig(BaseModel):
class Config:
title = "Source Facebook Marketing"
Expand Down Expand Up @@ -57,6 +71,12 @@ class Config:
minimum=1,
maximum=30,
)
insights: Optional[List[InsightConfig]] = Field(
vladimir-remar marked this conversation as resolved.
Show resolved Hide resolved
description="A defined list wich contains insights entries, each entry must have a name and can contain these entries(fields, breakdowns or action_breakdowns)",
examples=[
'[{"name": "AdsInsights","fields": ["account_id","account_name","ad_id","ad_name","adset_id","adset_name","campaign_id","campaign_name","date_start","impressions","spend"],"breakdowns": [],"action_breakdowns": []}]'
],
)


class SourceFacebookMarketing(AbstractSource):
Expand Down Expand Up @@ -94,7 +114,7 @@ def streams(self, config: Mapping[str, Any]) -> List[Type[Stream]]:
days_per_job=config.insights_days_per_job,
)

return [
streams = [
Campaigns(api=api, start_date=config.start_date, include_deleted=config.include_deleted),
AdSets(api=api, start_date=config.start_date, include_deleted=config.include_deleted),
Ads(api=api, start_date=config.start_date, include_deleted=config.include_deleted),
Expand All @@ -108,6 +128,8 @@ def streams(self, config: Mapping[str, Any]) -> List[Type[Stream]]:
AdsInsightsActionType(**insights_args),
]

return self._update_insights_streams(insights=config.insights, args=insights_args, streams=streams)

def spec(self, *args, **kwargs) -> ConnectorSpecification:
"""
Returns the spec for this integration. The spec is a JSON-Schema object describing the required configurations (e.g: username and password)
Expand All @@ -126,3 +148,28 @@ def spec(self, *args, **kwargs) -> ConnectorSpecification:
),
),
)

def _update_insights_streams(self, insights, args, streams) -> List[Type[Stream]]:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest the following approach for these custom streams:

  1. The "standard" streams offered by the connector are always available (if a user doesn't want them they can always just deselect them)
  2. If the user inputs any custom streams, they are named as custom_<user-input-name> and appended to the list of streams

This way it is very very obvious to the user what is happening. This is especially important as the connector's config is updated over time e.g: a user might call a stream ads_insights today, then remove it next week, and now the data represented in that stream is mixed with the "standard" ads insight stream and the "custom" insight stream. Making the suggestion above to make such situations much less likely.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the change in the lastest commit

"""Update method, if insights have values returns streams replacing the
default insights streams else returns streams

"""
if not insights:
return streams

insights_custom_streams = list()

for insight in insights:
args["name"] = insight.name
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this mutating the same config over and over, so in the end all the streams have the same config? can we copy the args instead? e.g:

arg_copy = copy.deepcopy(args)
arg_copy["fields"] = ...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sherifnada the streams being created each time, so config never shared

args["fields"] = insight.fields
args["breakdowns"] = insight.breakdowns
args["action_breakdowns"] = insight.action_breakdowns
insight_stream = AdsInsights(**args)
insights_custom_streams.append(insight_stream)

new_streams = list()
for stream in streams:
if stream.name not in [e.name for e in insights_custom_streams]:
new_streams.append(stream)

return new_streams + insights_custom_streams
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from datetime import datetime
from typing import Any, Iterable, Iterator, List, Mapping, MutableMapping, Optional, Sequence

import airbyte_cdk.sources.utils.casing as casing
import backoff
import pendulum
from airbyte_cdk.models import SyncMode
Expand Down Expand Up @@ -290,10 +291,32 @@ class AdsInsights(FBMarketingIncrementalStream):

breakdowns = []

def __init__(self, buffer_days, days_per_job, **kwargs):
def __init__(
self,
buffer_days,
days_per_job,
name: str = None,
fields: List[str] = None,
breakdowns: List[str] = None,
action_breakdowns: List[str] = None,
**kwargs,
):

super().__init__(**kwargs)
self.lookback_window = pendulum.duration(days=buffer_days)
self._days_per_job = days_per_job
self._fields = fields
self.action_breakdowns = action_breakdowns or self.action_breakdowns
self.breakdowns = breakdowns or self.breakdowns
self._new_class_name = name

@property
def name(self) -> str:
"""
:return: Stream name. By default this is the implementing class name, but it can be overridden as needed.
"""
name = self._new_class_name or self.__class__.__name__
return casing.camel_to_snake(name)

def read_records(
self,
Expand Down Expand Up @@ -388,12 +411,16 @@ def get_json_schema(self) -> Mapping[str, Any]:
:return: A dict of the JSON schema representing this stream.
"""
schema = ResourceSchemaLoader(package_name_from_class(self.__class__)).get_schema("ads_insights")
if self._fields:
schema["properties"] = {k: v for k, v in schema["properties"].items() if k in self._fields}
schema["properties"].update(self._schema_for_breakdowns())
return schema

@cached_property
def fields(self) -> List[str]:
"""List of fields that we want to query, for now just all properties from stream's schema"""
if self._fields:
return self._fields
schema = ResourceSchemaLoader(package_name_from_class(self.__class__)).get_schema("ads_insights")
return list(schema.get("properties", {}).keys())

Expand Down
1 change: 1 addition & 0 deletions docs/integrations/sources/facebook-marketing.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ See Facebook's [documentation on rate limiting](https://developers.facebook.com/

| Version | Date | Pull Request | Subject |
| :------ | :-------- | :----- | :------ |
| 0.2.21 | 2021-10-05 | [4864](https://github.com/airbytehq/airbyte/pull/4864) | Update insights streams with custom entries for fields, breakdowns and action_breakdowns |
| 0.2.20 | 2021-10-04 | [6719](https://github.com/airbytehq/airbyte/pull/6719) | Update version of facebook_bussiness package to 12.0 |
| 0.2.19 | 2021-09-30 | [6438](https://github.com/airbytehq/airbyte/pull/6438) | Annotate Oauth2 flow initialization parameters in connector specification |
| 0.2.18 | 2021-09-28 | [6499](https://github.com/airbytehq/airbyte/pull/6499) | Fix field values converting fail |
Expand Down