From 99bbc4e36fa34fe906853f237510af6e8d0b1612 Mon Sep 17 00:00:00 2001
From: Sam RL <samrosslaye@gmail.com>
Date: Wed, 27 May 2026 18:24:36 +0100
Subject: [PATCH] Fix Pipedrive set custom field string mapping

---
 .../pipedrive/helpers/custom_fields_munger.py | 18 ++++++++++++++-
 tests/pipedrive/test_pipedrive_source.py      | 22 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/sources/pipedrive/helpers/custom_fields_munger.py b/sources/pipedrive/helpers/custom_fields_munger.py
index b65a4e30e..a41677064 100644
--- a/sources/pipedrive/helpers/custom_fields_munger.py
+++ b/sources/pipedrive/helpers/custom_fields_munger.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict, TypedDict, Optional
+from typing import Any, Dict, TypedDict, Optional, List
 
 import dlt
 
@@ -93,6 +93,7 @@ def rename_fields(data: TDataPage, fields_mapping: Dict[str, Any]) -> TDataPage:
             options_map = field["options"]
             # Get label instead of ID for 'enum' and 'set' fields
             if field_value and field["field_type"] == "set":  # Multiple choice
+                field_value = _coerce_set_field_value(field_value)
                 field_value = [
                     options_map.get(str(enum_id), enum_id) for enum_id in field_value
                 ]
@@ -100,3 +101,18 @@ def rename_fields(data: TDataPage, fields_mapping: Dict[str, Any]) -> TDataPage:
                 field_value = options_map.get(str(field_value), field_value)
             data_item[field_name] = field_value
     return data
+
+
+def _coerce_set_field_value(field_value: Any) -> List[Any]:
+    """Normalize Pipedrive `set` custom fields to a list of option ids."""
+    if isinstance(field_value, str):
+        return [
+            option_id.strip()
+            for option_id in field_value.split(",")
+            if option_id.strip()
+        ]
+    if isinstance(field_value, list):
+        return field_value
+    if isinstance(field_value, tuple):
+        return list(field_value)
+    return [field_value]
diff --git a/tests/pipedrive/test_pipedrive_source.py b/tests/pipedrive/test_pipedrive_source.py
index e92646f34..f2da1bda0 100644
--- a/tests/pipedrive/test_pipedrive_source.py
+++ b/tests/pipedrive/test_pipedrive_source.py
@@ -439,6 +439,28 @@ def test_rename_fields_with_set() -> None:
     assert result == [{"custom_field_1": ["b", "a", "c"], "id": 44, "name": "asdf"}]
 
 
+def test_rename_fields_with_set_csv_string() -> None:
+    data_item = {"random_hash_1": "62,63,65", "id": 44, "name": "asdf"}
+    mapping = {
+        "random_hash_1": {
+            "name": "services",
+            "normalized_name": "services",
+            "field_type": "set",
+            "options": {"62": "Service A", "63": "Service B", "65": "Service C"},
+        }
+    }
+
+    result = rename_fields([data_item], mapping)
+
+    assert result == [
+        {
+            "services": ["Service A", "Service B", "Service C"],
+            "id": 44,
+            "name": "asdf",
+        }
+    ]
+
+
 def test_recents_none_data_items_from_recents() -> None:
     pytest.skip("Unskip after setting up credentials.")
     """Pages from /recents sometimes contain `None` data items which cause errors.