ingestr 0.12.7__tar.gz → 0.12.8__tar.gz

{ingestr-0.12.7 → ingestr-0.12.8}/.githooks/pre-commit-hook.sh

@@ -13,11 +13,11 @@ secret_detected() {
 
 # use gitleaks binary if available
 # else fallback to using docker for running gitleaks
-CMD="gitleaks dir -v"
+CMD="gitleaks protect --staged -v"
 
 if [[ ! `which gitleaks`  ]]; then
     which docker > /dev/null || (echo "gitleaks or docker is required for running secrets scan." && exit 1)
-    CMD="docker run -v $PWD:$WORK_DIR -w $WORK_DIR --rm ghcr.io/gitleaks/gitleaks:latest dir -v"
+    CMD="docker run -v $PWD:$WORK_DIR -w $WORK_DIR --rm ghcr.io/gitleaks/gitleaks:latest protect --staged -v"
 fi
 
 $CMD || secret_detected

{ingestr-0.12.7 → ingestr-0.12.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ingestr
-Version: 0.12.7
+Version: 0.12.8
 Summary: ingestr is a command-line application that ingests data from various sources and stores them in any database.
 Project-URL: Homepage, https://github.com/bruin-data/ingestr
 Project-URL: Issues, https://github.com/bruin-data/ingestr/issues

{ingestr-0.12.7 → ingestr-0.12.8}/docs/supported-sources/adjust.md

@@ -34,6 +34,7 @@ Adjust source allows ingesting data from various sources:
 
 - `campaigns`: Retrieves data for a campaign, showing the app's revenue and network costs over multiple days.
 - `creatives`: Retrieves data for a creative assets, detailing the app's revenue and network costs across multiple days.
+- `events`: Retrieves data for [events](https://dev.adjust.com/en/api/rs-api/events/) and event slugs.
 - `custom`: Retrieves custom data based on the dimensions and metrics specified.
 
 ### Custom reports: `custom:<dimensions>:<metrics>[:<filters>]`

{ingestr-0.12.7 → ingestr-0.12.8}/docs/supported-sources/appstore.md

@@ -17,7 +17,8 @@ URI Parameters:
 * `key_path`: path to API private key
 * `key_id`: ID of the generated key
 * `issuer_id`: Issuer ID of the generated key
-* `app_id`: application ID of your app. You can specify `app_id` multiple times with different ids to ingest data for multiple apps.
+* `app_id`: optional, application ID of your app. You can specify `app_id` multiple times with different ids to ingest data for multiple apps.
+  * You can also define the app_id in the table name. For example, `app-downloads-detailed:12345,67890` will ingest data for app with id `12345` and `67890`.
 
 ## Setting up Appstore Integration
 

{ingestr-0.12.7 → ingestr-0.12.8}/ingestr/src/adjust/__init__.py

@@ -56,6 +56,11 @@ def adjust_source(
             filters=filters,
         )
 
+    @dlt.resource(write_disposition="replace", primary_key="id")
+    def events():
+        adjust_api = AdjustAPI(api_key=api_key)
+        yield adjust_api.fetch_events()
+
     @dlt.resource(write_disposition="merge", merge_key="day")
     def creatives():
         adjust_api = AdjustAPI(api_key=api_key)
@@ -68,7 +73,7 @@ def adjust_source(
         )
 
     if not dimensions:
-        return campaigns, creatives
+        return campaigns, creatives, events
 
     merge_key = merge_key
     type_hints = {}
@@ -100,4 +105,4 @@ def adjust_source(
             filters=filters,
         )
 
-    return campaigns, creatives, custom
+    return campaigns, creatives, custom, events

{ingestr-0.12.7 → ingestr-0.12.8}/ingestr/src/adjust/adjust_helpers.py

@@ -28,10 +28,20 @@ DEFAULT_METRICS = [
 ]
 
 
+def retry_on_limit(response: requests.Response, exception: BaseException) -> bool:
+    return response.status_code == 429
+
+
 class AdjustAPI:
     def __init__(self, api_key):
         self.api_key = api_key
-        self.uri = "https://automate.adjust.com/reports-service/report"
+        self.request_client = Client(
+            request_timeout=8.0,
+            raise_for_status=False,
+            retry_condition=retry_on_limit,
+            request_max_attempts=12,
+            request_backoff_factor=2,
+        ).session
 
     def fetch_report_data(
         self,
@@ -62,20 +72,11 @@ class AdjustAPI:
                 f"Invalid date range: Start date ({start_date}) must be earlier than end date ({end_date})."
             )
 
-        def retry_on_limit(
-            response: requests.Response, exception: BaseException
-        ) -> bool:
-            return response.status_code == 429
-
-        request_client = Client(
-            request_timeout=8.0,
-            raise_for_status=False,
-            retry_condition=retry_on_limit,
-            request_max_attempts=12,
-            request_backoff_factor=2,
-        ).session
-
-        response = request_client.get(self.uri, headers=headers, params=params)
+        response = self.request_client.get(
+            "https://automate.adjust.com/reports-service/report",
+            headers=headers,
+            params=params,
+        )
         if response.status_code == 200:
             result = response.json()
             items = result.get("rows", [])
@@ -83,6 +84,17 @@ class AdjustAPI:
         else:
             raise HTTPError(f"Request failed with status code: {response.status_code}")
 
+    def fetch_events(self):
+        headers = {"Authorization": f"Bearer {self.api_key}"}
+        response = self.request_client.get(
+            "https://automate.adjust.com/reports-service/events", headers=headers
+        )
+        if response.status_code == 200:
+            result = response.json()
+            yield result
+        else:
+            raise HTTPError(f"Request failed with status code: {response.status_code}")
+
 
 def parse_filters(filters_raw: str) -> dict:
     # Parse filter string like "key1=value1,key2=value2,value3,value4"

ingestr-0.12.8/ingestr/src/version.py

@@ -0,0 +1 @@
+__version__ = "0.12.8"

ingestr-0.12.7/ingestr/src/version.py

@@ -1 +0,0 @@
-__version__ = "0.12.7"