ingestr 0.13.30__tar.gz → 0.13.31__tar.gz

{ingestr-0.13.30 → ingestr-0.13.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ingestr
-Version: 0.13.30
+Version: 0.13.31
 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
@@ -74,7 +74,7 @@ Requires-Dist: google-cloud-storage==3.1.0
 Requires-Dist: google-crc32c==1.6.0
 Requires-Dist: google-resumable-media==2.7.2
 Requires-Dist: googleapis-common-protos==1.69.0
-Requires-Dist: greenlet==3.2.0
+Requires-Dist: greenlet==3.2.1
 Requires-Dist: grpcio-status==1.62.3
 Requires-Dist: grpcio==1.70.0
 Requires-Dist: hdbcli==2.23.27

ingestr-0.13.31/ingestr/src/buildinfo.py

@@ -0,0 +1 @@
+version = "v0.13.31"

{ingestr-0.13.30 → ingestr-0.13.31}/ingestr/src/hubspot/__init__.py

@@ -32,7 +32,12 @@ from dlt.common import pendulum
 from dlt.common.typing import TDataItems
 from dlt.sources import DltResource
 
-from .helpers import _get_property_names, fetch_data, fetch_property_history
+from .helpers import (
+    _get_property_names,
+    fetch_data,
+    fetch_data_raw,
+    fetch_property_history,
+)
 from .settings import (
     ALL,
     CRM_OBJECT_ENDPOINTS,
@@ -192,12 +197,21 @@ def hubspot(
         api_key: str = api_key,
         custom_object_name: str = custom_object,
     ) -> Iterator[TDataItems]:
-        get_custom_object = schemas(api_key)
+        get_custom_object = fetch_data_raw(CRM_SCHEMAS_ENDPOINT, api_key)
         object_type_id = None
-        for custom_object in get_custom_object:
-            if custom_object["name"] == custom_object_name.capitalize():
+
+        custom_object_lowercase = custom_object_name.lower()
+        for custom_object in get_custom_object["results"]:
+            if custom_object["name"].lower() == custom_object_lowercase:
                 object_type_id = custom_object["objectTypeId"]
                 break
+
+            # sometimes people use the plural name of the object type by accident, we should try to match that if we can
+            if "labels" in custom_object:
+                if custom_object_lowercase == custom_object["labels"]["plural"].lower():
+                    object_type_id = custom_object["objectTypeId"]
+                    break
+
         if object_type_id is None:
             raise ValueError(f"There is no such custom object as {custom_object_name}")
         custom_object_properties = f"crm/v3/properties/{object_type_id}"

{ingestr-0.13.30 → ingestr-0.13.31}/ingestr/src/hubspot/helpers.py

@@ -130,6 +130,7 @@ def fetch_data(
     # Parse the API response and yield the properties of each result
     # Parse the response JSON data
     _data = r.json()
+
     # Yield the properties of each result in the API response
     while _data is not None:
         if "results" in _data:
@@ -156,6 +157,7 @@ def fetch_data(
                     if "id" not in _obj and "id" in _result:
                         # Move id from properties to top level
                         _obj["id"] = _result["id"]
+
                     if "associations" in _result:
                         for association in _result["associations"]:
                             __values = [
@@ -168,12 +170,13 @@ def fetch_data(
                                 ]
                             ]
 
-                        # remove duplicates from list of dicts
-                        __values = [
-                            dict(t) for t in {tuple(d.items()) for d in __values}
-                        ]
+                            # remove duplicates from list of dicts
+                            __values = [
+                                dict(t) for t in {tuple(d.items()) for d in __values}
+                            ]
+
+                            _obj[association] = __values
 
-                        _obj[association] = __values
                     _objects.append(_obj)
             yield _objects
 
@@ -208,3 +211,12 @@ def _get_property_names(api_key: str, object_type: str) -> List[str]:
         properties.extend([prop["name"] for prop in page])
 
     return properties
+
+
+def fetch_data_raw(
+    endpoint: str, api_key: str, params: Optional[Dict[str, Any]] = None
+) -> Iterator[List[Dict[str, Any]]]:
+    url = get_url(endpoint)
+    headers = _get_headers(api_key)
+    r = requests.get(url, headers=headers, params=params)
+    return r.json()

{ingestr-0.13.30 → ingestr-0.13.31}/requirements.txt

@@ -187,7 +187,7 @@ googleapis-common-protos==1.69.0
     #   google-ads
     #   google-api-core
     #   grpcio-status
-greenlet==3.2.0
+greenlet==3.2.1
     # via sqlalchemy
 grpcio==1.70.0
     # via

ingestr-0.13.30/ingestr/src/buildinfo.py

@@ -1 +0,0 @@
-version = "v0.13.30"