ci: rebuild-v2 python patch onto upstream main

Author: KingLizard1020

.github/workflows/squash-once.yml

@@ -1,4 +1,5 @@
 name: squash-once
+# rebuild-v2-python-patch
 on:
   push:
     paths:
@@ -31,11 +32,61 @@ jobs:
           UPSTREAM=$(git rev-parse upstream/main)
           echo "upstream/main=$UPSTREAM"
           git checkout -B rebuild "$UPSTREAM"
-          git show 825e69ca5c6bbdbc93f87a1f1b583f3d47114eb9 -- temporalio/converter/_search_attributes.py tests/test_converter.py | git apply --index
           python3 <<'PY'
           from pathlib import Path
-          p = Path("CHANGELOG.md")
-          cl = p.read_text()
+
+          sa_path = Path("temporalio/converter/_search_attributes.py")
+          sa = sa_path.read_text()
+          old = (
+              "    # datetime needs to be in isoformat\n"
+              "    if isinstance(value, datetime):\n"
+              "        value = value.isoformat()"
+          )
+          new = (
+              "    # datetime needs to be in isoformat\n"
+              "    if isinstance(value, datetime):\n"
+              "        if value.tzinfo is None:\n"
+              "            raise ValueError(\"Timezone must be present on all search attribute dates\")\n"
+              "        value = value.isoformat()"
+          )
+          if old not in sa:
+              raise SystemExit("search_attributes patch anchor missing")
+          sa_path.write_text(sa.replace(old, new, 1))
+
+          tc_path = Path("tests/test_converter.py")
+          tc = tc_path.read_text()
+          imp_old = "encode_search_attribute_values,\n    value_to_type,"
+          imp_new = (
+              "encode_search_attribute_values,\n"
+              "    encode_typed_search_attribute_value,\n"
+              "    value_to_type,"
+          )
+          if imp_old not in tc:
+              raise SystemExit("test_converter import anchor missing")
+          tc = tc.replace(imp_old, imp_new, 1)
+          test_fn = (
+              "def test_encode_typed_search_attribute_value_datetime_requires_timezone():\n"
+              "    key = temporalio.common.SearchAttributeKey.for_datetime(\"checkout_time\")\n"
+              "    with pytest.raises(ValueError, match=\"Timezone must be present\"):\n"
+              "        encode_typed_search_attribute_value(\n"
+              "            key, datetime(2024, 7, 5, 15, 43, 7, 875302)\n"
+              "        )\n"
+              "    payload = encode_typed_search_attribute_value(\n"
+              "        key, datetime(2024, 7, 5, 15, 43, 7, 875302, tzinfo=timezone.utc)\n"
+              "    )\n"
+              "    assert payload.metadata[\"type\"] == b\"Datetime\"\n"
+              "\n"
+              "\n"
+          )
+          anchor = "def test_decode_search_attributes():"
+          if anchor not in tc:
+              raise SystemExit("test_converter function anchor missing")
+          if "test_encode_typed_search_attribute_value_datetime_requires_timezone" not in tc:
+              tc = tc.replace(anchor, test_fn + anchor, 1)
+          tc_path.write_text(tc)
+
+          cl_path = Path("CHANGELOG.md")
+          cl = cl_path.read_text()
           bullet = (
               "- Encoding a datetime search attribute without a timezone now raises\n"
               "  `ValueError(\"Timezone must be present on all search attribute dates\")` on\n"
@@ -50,10 +101,10 @@ jobs:
               if fixed < 0:
                   raise SystemExit("Fixed section missing")
               insert = fixed + len("### Fixed\n\n")
-              p.write_text(cl[:insert] + bullet + cl[insert:])
-          print("CHANGELOG ok")
+              cl_path.write_text(cl[:insert] + bullet + cl[insert:])
+          print("patches applied")
           PY
-          git add CHANGELOG.md
+          git add temporalio/converter/_search_attributes.py tests/test_converter.py CHANGELOG.md
           rm -f .github/workflows/squash-once.yml .github/workflows/apply-review-fix.yml || true
           git rm -f --ignore-unmatch .github/workflows/squash-once.yml .github/workflows/apply-review-fix.yml || true
           find . -maxdepth 3 -name ".cursor-*" -type f -delete 2>/dev/null || true
@@ -83,4 +134,5 @@ jobs:
           test "$(git log -1 --format=%an)" = "Kailash Nelson"
           test "$(git log -1 --format=%ae)" = "37966146+KingLizard1020@users.noreply.github.com"
           ! git log -1 --format=%B | grep -qi cursor
+          git rev-parse HEAD^ | grep -qx "$UPSTREAM"
           git push --force origin "HEAD:cursor/datetime-search-attr-tz-0487"