review changes

mittal-tushar · mittal-tushar · commit a933890bae63 · 2026-03-30T13:09:04.000+05:30
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,25 @@
 # Changelog
 
-## 0.1.0
-- Initial Singer-compatible tap-sendgrid implementation.
+## 2.0.0
+- Latest Singer-compatible tap-sendgrid implementation.
+
+## 1.0.5
+* Dependency upgrades [#15](https://github.com/singer-io/tap-sendgrid/pull/15)
+
+## 1.0.4
+  * Add pytz to install_requires [#13](https://github.com/singer-io/tap-sendgrid/pull/13)
+
+## 1.0.3
+  * Reverts #3
+
+## 1.0.2
+  * Updates permissions used for reading campaigns [#3](https://github.com/singer-io/tap-sendgrid/pull/3)
+
+## 1.0.1
+  * Update version of `requests` to `2.20.0` in response to CVE 2018-18074
+
+## 0.1.2
+  * Fix filtering code to include automatic fields [#2](https://github.com/singer-io/tap-sendgrid/pull/2)
+
+## 0.1.1
+  * Setting key properties to automatic [#1](https://github.com/singer-io/tap-sendgrid/pull/1)
diff --git a/setup.py b/setup.py
@@ -2,12 +2,11 @@
 
 setup(
     name="tap-sendgrid",
-    version="0.1.0",
+    version="2.0.0",
     description="Singer.io tap for extracting data from the SendGrid v3 API",
     author="Stitch",
     url="http://singer.io",
     classifiers=["Programming Language :: Python :: 3 :: Only"],
-    py_modules=["tap_sendgrid"],
     install_requires=[
         "singer-python==6.1.1",
         "requests==2.31.0",
diff --git a/tap_sendgrid/client.py b/tap_sendgrid/client.py
@@ -167,4 +167,6 @@ def to_unix_timestamp(value: str) -> int:
     if stripped.lstrip("-").isdigit():
         return int(stripped)
     dt = datetime.fromisoformat(stripped.replace("Z", "+00:00"))
-    return int(dt.replace(tzinfo=timezone.utc).timestamp())
+    if dt.tzinfo is None:
+        dt = dt.replace(tzinfo=timezone.utc)
+    return int(dt.timestamp())
diff --git a/tap_sendgrid/schemas/blocks.json b/tap_sendgrid/schemas/blocks.json
@@ -27,4 +27,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/bounces.json b/tap_sendgrid/schemas/bounces.json
@@ -27,4 +27,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/global_suppressions.json b/tap_sendgrid/schemas/global_suppressions.json
@@ -15,4 +15,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/invalid_emails.json b/tap_sendgrid/schemas/invalid_emails.json
@@ -21,4 +21,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/lists.json b/tap_sendgrid/schemas/lists.json
@@ -21,4 +21,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/marketing_contacts_count.json b/tap_sendgrid/schemas/marketing_contacts_count.json
@@ -47,4 +47,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/marketing_field_definitions.json b/tap_sendgrid/schemas/marketing_field_definitions.json
@@ -27,4 +27,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/segments.json b/tap_sendgrid/schemas/segments.json
@@ -75,4 +75,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/single_sends.json b/tap_sendgrid/schemas/single_sends.json
@@ -28,4 +28,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/spam_reports.json b/tap_sendgrid/schemas/spam_reports.json
@@ -27,4 +27,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/suppression_group_members.json b/tap_sendgrid/schemas/suppression_group_members.json
@@ -16,4 +16,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/suppression_groups.json b/tap_sendgrid/schemas/suppression_groups.json
@@ -28,4 +28,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/schemas/templates.json b/tap_sendgrid/schemas/templates.json
@@ -28,4 +28,4 @@
     }
   },
   "additionalProperties": true
-}
+}
diff --git a/tap_sendgrid/streams/abstracts.py b/tap_sendgrid/streams/abstracts.py
@@ -23,6 +23,19 @@
 from tap_sendgrid.client import to_unix_timestamp
 
 
+def _parse_datetime(value: str) -> datetime:
+    """Parse an ISO 8601 / RFC 3339 string into a timezone-aware UTC datetime.
+
+    Using a parsed ``datetime`` for comparisons and ``max()`` is safe regardless
+    of offset representation (``Z`` vs ``+00:00`` vs ``-05:00``), whereas raw
+    string comparison is not reliably orderable across different offset formats.
+    """
+    dt = datetime.fromisoformat(str(value).replace("Z", "+00:00"))
+    if dt.tzinfo is None:
+        dt = dt.replace(tzinfo=timezone.utc)
+    return dt.astimezone(timezone.utc)
+
+
 class BaseStream(ABC):
     """Abstract base class shared by all tap-sendgrid stream implementations."""
 
@@ -216,19 +229,29 @@ def get_params_for_sync(self, bookmark: Any) -> Dict[str, Any]:
         return params
 
     def normalize_record_cursor(self, record: Dict[str, Any]) -> Any:
-        """Coerce the replication key value to the expected type and update *record* in place."""
+        """Coerce the replication key value to the expected type and update *record* in place.
+
+        For ``cursor_type == 'unix'`` the raw value is coerced to ``int``.
+        For ``cursor_type == 'datetime'`` the value is parsed to a timezone-aware
+        ``datetime`` in UTC so that comparisons and ``max()`` in ``sync()`` are
+        safe across different RFC 3339 offset representations.
+        """
         key = self.replication_keys[0]
         value = record.get(key)
         if self.cursor_type == "unix" and isinstance(value, str):
             value = int(value)
             record[key] = value
+        elif self.cursor_type == "datetime" and isinstance(value, str):
+            value = _parse_datetime(value)
         return value
 
     def sync(self, state: Dict, transformer: Transformer, parent_obj: Optional[Dict] = None) -> int:
         """Sync incremental records, filter by bookmark, and persist state."""
         bookmark = self.get_start_value(state)
         if self.cursor_type == "unix" and isinstance(bookmark, str):
             bookmark = to_unix_timestamp(bookmark)
+        elif self.cursor_type == "datetime" and isinstance(bookmark, str):
+            bookmark = _parse_datetime(bookmark)
         current_max = bookmark
         record_count = 0
 
@@ -253,6 +276,9 @@ def sync(self, state: Dict, transformer: Transformer, parent_obj: Optional[Dict]
 
         if self.cursor_type == "unix":
             bk_str = datetime.fromtimestamp(current_max, tz=timezone.utc).isoformat()
+        elif self.cursor_type == "datetime":
+            # current_max is a UTC datetime object; serialise to ISO string.
+            bk_str = current_max.isoformat() if isinstance(current_max, datetime) else str(current_max)
         else:
             bk_str = str(current_max)
         write_bookmark(state, self.tap_stream_id, self.replication_keys[0], bk_str)
diff --git a/tests/test_bookmark.py b/tests/test_bookmark.py
@@ -14,11 +14,11 @@ class SendgridBookmarkTest(BookmarkTest, SendgridBaseTest):
     bookmark_format = "%Y-%m-%dT%H:%M:%S%z"
     initial_bookmarks = {
         "bookmarks": {
-            "blocks":             {"created": "2020-01-01T00:00:00.000000Z"},
-            "bounces":            {"created": "2020-01-01T00:00:00.000000Z"},
-            "spam_reports":       {"created": "2020-01-01T00:00:00.000000Z"},
-            "invalid_emails":     {"created": "2020-01-01T00:00:00.000000Z"},
-            "global_suppressions":{"created": "2020-01-01T00:00:00.000000Z"},
+            "blocks":             {"created": "2020-01-01T00:00:00Z"},
+            "bounces":            {"created": "2020-01-01T00:00:00Z"},
+            "spam_reports":       {"created": "2020-01-01T00:00:00Z"},
+            "invalid_emails":     {"created": "2020-01-01T00:00:00Z"},
+            "global_suppressions":{"created": "2020-01-01T00:00:00Z"},
         }
     }
 
@@ -45,7 +45,7 @@ def test_excluded_streams_are_documented(self):
 
     def calculate_new_bookmarks(self):
         """Return a deterministic future bookmark for all incremental streams."""
-        return {s: {"created": "2026-02-03T00:00:00.000000Z"} for s in self.streams_to_test()}
+        return {s: {"created": "2026-02-03T00:00:00Z"} for s in self.streams_to_test()}
 
     def test_first_sync_bookmark(self):
         """Verify sync-1 bookmark equals max replication key. Skip streams with no records."""
diff --git a/tests/unittests/test_schemas.py b/tests/unittests/test_schemas.py
@@ -3,7 +3,7 @@
 Validates that all schema files are:
 - Valid JSON
 - Properly structured (type, properties)
-- Free of root-level additionalProperties
+- Root-level additionalProperties, if present, must be True (not False or an object)
 - Using date-time format on all datetime string fields
 - Using consistent 2-space indentation
 """

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,4 @@`
`27`	`27`	`}`
`28`	`28`	`},`
`29`	`29`	`"additionalProperties": true`
`30`		`-}`
	`30`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@`
`15`	`15`	`}`
`16`	`16`	`},`
`17`	`17`	`"additionalProperties": true`
`18`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@`
`21`	`21`	`}`
`22`	`22`	`},`
`23`	`23`	`"additionalProperties": true`
`24`		`-}`
	`24`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,4 @@`
`47`	`47`	`}`
`48`	`48`	`},`
`49`	`49`	`"additionalProperties": true`
`50`		`-}`
	`50`	`+}`