minor fixes

Author: dat-a-man

sources/pipedrive/__init__.py

@@ -9,18 +9,19 @@
 To get an api key: https://pipedrive.readme.io/docs/how-to-find-the-api-token
 """
 
-from typing import Any, Dict, Iterator, List, Optional, Union, Iterator
+from typing import Any, Dict, Iterator, List, Optional, Union, Iterable
 
 import dlt
+from dlt.common import pendulum
+from dlt.common.time import ensure_pendulum_datetime
+from dlt.common.typing import TDataItems
+from dlt.sources import DltResource
 
 from .helpers.custom_fields_munger import update_fields_mapping, rename_fields
 from .helpers.pages import get_recent_items_incremental, get_pages
 from .helpers import group_deal_flows
 from .typing import TDataPage
 from .settings import ENTITY_MAPPINGS, RECENTS_ENTITIES
-from dlt.common import pendulum
-from dlt.common.time import ensure_pendulum_datetime
-from dlt.sources import DltResource, TDataItems
 
 # Export v2 source for easy access
 from .rest_v2 import pipedrive_v2_source
@@ -30,7 +31,7 @@
 def pipedrive_source(
     pipedrive_api_key: str = dlt.secrets.value,
     since_timestamp: Optional[Union[pendulum.DateTime, str]] = "1970-01-01 00:00:00",
-) -> Iterator[DltResource]:
+) -> Iterable[DltResource]:
     """
     Get data from the Pipedrive API. Supports incremental loading and custom fields mapping.
 

sources/pipedrive/rest_v2/__init__.py

@@ -1,4 +1,4 @@
-from typing import Iterable, Dict, Any, List, Optional, Iterator, Union, cast
+from typing import Iterable, Dict, Any, List, Optional, Union, cast
 
 import dlt
 from dlt.sources import DltResource
@@ -14,7 +14,7 @@ def pipedrive_v2_source(
     company_domain: str = dlt.secrets.value,
     resources: Optional[List[str]] = None,
     prefix: str = "v2_",
-) -> Iterator[DltResource]:
+) -> Iterable[DltResource]:
     """
     Get data from the Pipedrive API v2.
 
@@ -109,8 +109,6 @@ def rest_v2_resources(
             nested_resource_def["primary_key"] = primary_key
         resources.append(nested_resource_def)
 
-    # Create config with proper typing
-    # Cast resources to the expected type since our Dict[str, Any] matches EndpointResource structure
     config: RESTAPIConfig = {
         "client": {
             "base_url": f"https://{company_domain}.pipedrive.com/api/v2/",

sources/pipedrive/settings.py

@@ -93,10 +93,7 @@
     "deal_followers": {
         "parent": "deals",
         "endpoint_path": "deals/{id}/followers",
-        "primary_key": [
-            "user_id",
-            "_deals_id",
-        ],  # Followers don't have 'id', use composite key
+        "primary_key": ["user_id", "_deals_id"],  # Followers don't have 'id', use composite key
         "include_from_parent": ["id"],  # Include deal id from parent
         "params": {
             "limit": 500,
@@ -108,11 +105,4 @@
 # This curated set includes the most commonly used endpoints.
 # Users can customize this list to match their needs.
 # See ENTITIES_V2 above for all available v2 endpoints.
-DEFAULT_V2_RESOURCES = [
-    "deals",
-    "persons",
-    "organizations",
-    "products",
-    "pipelines",
-    "stages",
-]
+DEFAULT_V2_RESOURCES = ["deals", "persons", "organizations" ,"products", "pipelines", "stages"]