Merge branch 'main' into update-maintainers

Author: xSAVIKx

.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@v8.1.0
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"
@@ -28,7 +28,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@v8.1.0
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"

.github/workflows/pypi-release.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@v8.1.0
       - name: Set up Python
         run: uv python install 3.12
       - name: Install the project
@@ -25,7 +25,7 @@ jobs:
       - name: Build SDist and wheel
         run: uv build
 
-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v7.0.1
         with:
           name: artifact
           path: dist/*
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8.0.1
         with:
           name: artifact
           path: dist

.pre-commit-config.yaml

@@ -6,19 +6,19 @@ repos:
       - id: end-of-file-fixer
       - id: check-toml
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.7
+    rev: v0.15.14
     hooks:
       # Run the linter.
       - id: ruff
       # Run the formatter.
       - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.19.1
+    rev: v1.20.2
     hooks:
       - id: mypy
         files: ^(src/cloudevents/|tests/)
         exclude: ^(src/cloudevents/v1/|tests/test_v1_compat/)
         types: [python]
         args: ["--config-file=pyproject.toml"]
         additional_dependencies:
-          - types-python-dateutil>=2.9.0.20260305
+          - types-python-dateutil>=2.9.0.20260518

CHANGELOG.md

@@ -6,10 +6,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.2.0]
+
+### Changed
+
+- Updated dev and build-time dependencies.
+
+### Fixed
+
+- Fixed an issue where setting a non-JSON datacontenttype (e.g.,
+  application/octet-stream) with dict data produced non-JSON-decodable output; now
+  best-effort json-encoding is applied regardless of datacontenttype. ([#291])
+- Updated behavior when datacontenttype is unset: now treats events as application/json
+  in line with spec recommendation. ([#291])
+
+## [2.1.0]
+
 ### Added
 
-- Added [RabbitMQ](https://github.com/knative-extensions/eventing-rabbitmq/blob/main/cloudevents-protocol-spec/spec.md)
-  protocol binding for CloudEvents.
+- Added [RabbitMQ][rabbit-mq-spec] protocol binding for CloudEvents. ([#284])
+
+[rabbit-mq-spec]: https://github.com/knative-extensions/eventing-rabbitmq/blob/main/cloudevents-protocol-spec/spec.md
 
 ## [2.0.0]
 
@@ -349,3 +366,5 @@ CloudEvents v2 is a rewrite with ongoing development ([#271])
 [#276]: https://github.com/cloudevents/sdk-python/pull/276
 [#278]: https://github.com/cloudevents/sdk-python/pull/278
 [#279]: https://github.com/cloudevents/sdk-python/pull/279
+[#284]: https://github.com/cloudevents/sdk-python/pull/284
+[#291]: https://github.com/cloudevents/sdk-python/pull/291

pyproject.toml

@@ -47,19 +47,19 @@ build-backend = "hatchling.build"
 
 [dependency-groups]
 dev = [
-    "ruff>=0.15.7",
-    "pytest>=9.0.2",
-    "mypy>=1.19.1",
+    "ruff>=0.15.14",
+    "pytest>=9.0.3",
+    "mypy>=1.20.2",
     "isort>=8.0.1",
     "flake8>=7.3.0",
     "pep8-naming>=0.15.1",
     "flake8-print>=5.0.0",
-    "pre-commit>=4.5.1",
+    "pre-commit>=4.6.0",
     "pytest-cov>=7.1.0",
-    "types-python-dateutil>=2.9.0.20260305",
+    "types-python-dateutil>=2.9.0.20260518",
     "sanic>=25.12.0",
     "sanic-testing>=24.6.0",
-    "pydantic>=2.12.5",
+    "pydantic>=2.13.4",
 ]
 
 [tool.uv.pip]

src/cloudevents/__init__.py

@@ -12,4 +12,4 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-__version__ = "2.0.0"
+__version__ = "2.2.0"

src/cloudevents/core/formats/json.py

@@ -44,6 +44,7 @@ def default(self, obj: Any) -> Any:
 
 class JSONFormat(Format):
     CONTENT_TYPE: Final[str] = "application/cloudevents+json"
+    DEFAULT_CONTENT_TYPE: Final[str] = "application/json"
     JSON_CONTENT_TYPE_PATTERN: Pattern[str] = re.compile(
         r"^(application|text)/([a-zA-Z0-9\-\.]+\+)?json(;.*)?$"
     )
@@ -135,7 +136,9 @@ def write(self, event: BaseCloudEvent) -> bytes:
                         "utf-8"
                     )
             else:
-                datacontenttype = event_dict.get("datacontenttype", "application/json")
+                datacontenttype = event_dict.get(
+                    "datacontenttype", self.DEFAULT_CONTENT_TYPE
+                )
                 if re.match(JSONFormat.JSON_CONTENT_TYPE_PATTERN, datacontenttype):
                     event_dict["data"] = event_data
                 else:
@@ -171,12 +174,19 @@ def write_data(
 
         # If data is a dict and content type is JSON, serialize as JSON
         if isinstance(data, dict):
-            if datacontenttype and re.match(
-                JSONFormat.JSON_CONTENT_TYPE_PATTERN, datacontenttype
-            ):
+            content_type = datacontenttype or self.DEFAULT_CONTENT_TYPE
+            if re.match(JSONFormat.JSON_CONTENT_TYPE_PATTERN, content_type):
                 return dumps(data, cls=_JSONEncoderWithDatetime).encode("utf-8")
 
-        # Default: convert to string and encode
+            # for other contenttypes we still try to generate a json-decodable string
+            # if not possible, a string representing
+            try:
+                return dumps(data, cls=_JSONEncoderWithDatetime).encode("utf-8")
+            except TypeError:
+                pass
+
+        # according to the spec, we return an encoded string per default
+        # careful: the result is not json-decodable as the dict keys are single-quoted
         return str(data).encode("utf-8")
 
     def read_data(
@@ -196,9 +206,8 @@ def read_data(
             return None
 
         # If content type indicates JSON, try to parse as JSON
-        if datacontenttype and re.match(
-            JSONFormat.JSON_CONTENT_TYPE_PATTERN, datacontenttype
-        ):
+        content_type = datacontenttype or self.DEFAULT_CONTENT_TYPE
+        if re.match(JSONFormat.JSON_CONTENT_TYPE_PATTERN, content_type):
             try:
                 decoded = body.decode("utf-8")
                 parsed: dict[str, Any] = loads(decoded)

tests/test_core/test_format/test_json.py

@@ -12,8 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 from datetime import datetime, timezone
+from json import loads
+
+import pytest
 
 from cloudevents.core.formats.json import JSONFormat
 from cloudevents.core.v1.event import CloudEvent
@@ -323,3 +325,24 @@ def test_read_cloud_event_from_string_input() -> None:
 
     assert result.get_id() == "123"
     assert result.get_source() == "source"
+
+
+@pytest.mark.parametrize(
+    "content_type", [None, "application/json", "application/octet-stream"]
+)
+def test_write_data_dict(content_type: str) -> None:
+    formatter = JSONFormat()
+    data = {"key": "value", "nested": {"a": 1}}
+    result = formatter.write_data(data, datacontenttype=content_type)
+
+    assert isinstance(result, bytes)
+    assert loads(result) == data
+
+
+@pytest.mark.parametrize("content_type", [None, "application/json"])
+def test_read_data_json_body(content_type: str) -> None:
+    formatter = JSONFormat()
+    body = b'{"key": "value"}'
+    result = formatter.read_data(body, content_type)
+
+    assert result == {"key": "value"}