ci: Merge branch 'main' into mathern/improve-pointer-handling

Author: tmathern

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "c2pa-python"
-version = "0.15.0"
+version = "0.17.0"
 requires-python = ">=3.10"
 description = "Python bindings for the C2PA Content Authenticity Initiative (CAI) library"
 readme = { file = "README.md", content-type = "text/markdown" }

requirements-dev.txt

@@ -16,4 +16,4 @@ autopep8==2.0.4  # For automatic code formatting
 flake8==7.3.0
 
 # Test dependencies (for callback signers)
-cryptography==45.0.4
+cryptography==45.0.6

requirements.txt

@@ -1,2 +1,2 @@
 # only used in the training example
-cryptography>=45.0.3
+cryptography>=45.0.6

scripts/download_artifacts.py

@@ -1,4 +1,18 @@
 #!/usr/bin/env python3
+
+# Copyright 2025 Adobe. All rights reserved.
+# This file is licensed to you under the Apache License,
+# Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+# or the MIT license (http://opensource.org/licenses/MIT),
+# at your option.
+
+# Unless required by applicable law or agreed to in writing,
+# this software is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
+# implied. See the LICENSE-MIT and LICENSE-APACHE files for the
+# specific language governing permissions and limitations under
+# each license.
+
 import os
 import sys
 import requests

setup.py

@@ -1,3 +1,16 @@
+# Copyright 2025 Adobe. All rights reserved.
+# This file is licensed to you under the Apache License,
+# Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+# or the MIT license (http://opensource.org/licenses/MIT),
+# at your option.
+
+# Unless required by applicable law or agreed to in writing,
+# this software is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
+# implied. See the LICENSE-MIT and LICENSE-APACHE files for the
+# specific language governing permissions and limitations under
+# each license.
+
 from setuptools import setup, find_namespace_packages
 import sys
 import platform

src/c2pa/__init__.py

@@ -1,3 +1,16 @@
+# Copyright 2025 Adobe. All rights reserved.
+# This file is licensed to you under the Apache License,
+# Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+# or the MIT license (http://opensource.org/licenses/MIT),
+# at your option.
+
+# Unless required by applicable law or agreed to in writing,
+# this software is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
+# implied. See the LICENSE-MIT and LICENSE-APACHE files for the
+# specific language governing permissions and limitations under
+# each license.
+
 try:
     from importlib.metadata import version
     __version__ = version("c2pa-python")

src/c2pa/build.py

@@ -1,3 +1,16 @@
+# Copyright 2025 Adobe. All rights reserved.
+# This file is licensed to you under the Apache License,
+# Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+# or the MIT license (http://opensource.org/licenses/MIT),
+# at your option.
+
+# Unless required by applicable law or agreed to in writing,
+# this software is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
+# implied. See the LICENSE-MIT and LICENSE-APACHE files for the
+# specific language governing permissions and limitations under
+# each license.
+
 import os
 import sys
 import requests

src/c2pa/c2pa.py

@@ -1,3 +1,16 @@
+# Copyright 2025 Adobe. All rights reserved.
+# This file is licensed to you under the Apache License,
+# Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+# or the MIT license (http://opensource.org/licenses/MIT),
+# at your option.
+
+# Unless required by applicable law or agreed to in writing,
+# this software is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
+# implied. See the LICENSE-MIT and LICENSE-APACHE files for the
+# specific language governing permissions and limitations under
+# each license.
+
 import ctypes
 import enum
 import json
@@ -664,6 +677,33 @@ def load_settings(settings: str, format: str = "json") -> None:
     return result
 
 
+def _get_mime_type_from_path(path: Union[str, Path]) -> str:
+    """Attempt to guess the MIME type from a file path (with extension).
+
+    Args:
+        path: File path as string or Path object
+
+    Returns:
+        MIME type string
+
+    Raises:
+        C2paError.NotSupported: If MIME type cannot be determined
+    """
+    path_obj = Path(path)
+    file_extension = path_obj.suffix.lower() if path_obj.suffix else ""
+
+    if file_extension == ".dng":
+        # mimetypes guesses the wrong type for dng,
+        # so we bypass it and set the correct type
+        return "image/dng"
+    else:
+        mime_type = mimetypes.guess_type(str(path))[0]
+        if not mime_type:
+            raise C2paError.NotSupported(
+                f"Could not determine MIME type for file: {path}")
+        return mime_type
+
+
 def read_ingredient_file(
         path: Union[str, Path], data_dir: Union[str, Path]) -> str:
     """Read a file as C2PA ingredient.
@@ -1290,7 +1330,11 @@ def __init__(self,
         """Create a new Reader.
 
         Args:
-            format_or_path: The format or path to read from
+            format_or_path: The format or path to read from.
+              The stream API (params format and an open stream) is
+              the recommended way to use the Reader. For paths, we
+              will attempt to guess the mimetype of the source
+              file based on the extension.
             stream: Optional stream to read from (Python stream-like object)
             manifest_data: Optional manifest data in bytes
 
@@ -1312,12 +1356,8 @@ def __init__(self,
             # If we don't get a stream as param:
             # Create a stream from the file path in format_or_path
             path = str(format_or_path)
-            mime_type = mimetypes.guess_type(
-                path)[0]
 
-            if not mime_type:
-                raise C2paError.NotSupported(
-                    f"Could not determine MIME type for file: {path}")
+            mime_type = _get_mime_type_from_path(path)
 
             if mime_type not in Reader.get_supported_mime_types():
                 raise C2paError.NotSupported(
@@ -2449,7 +2489,9 @@ def sign_file(self,
         """Sign a file and write the signed data to an output file.
 
         Args:
-            source_path: Path to the source file
+            source_path: Path to the source file. We will attempt
+              to guess the mimetype of the source file based on
+              the extension.
             dest_path: Path to write the signed file to
             signer: The signer to use
 
@@ -2459,11 +2501,8 @@ def sign_file(self,
         Raises:
             C2paError: If there was an error during signing
         """
-        # Get the MIME type from the file extension
-        mime_type = mimetypes.guess_type(str(source_path))[0]
-        if not mime_type:
-            raise C2paError.NotSupported(
-                f"Could not determine MIME type for file: {source_path}")
+
+        mime_type = _get_mime_type_from_path(source_path)
 
         try:
             # Open source file and destination file, then use the sign method

tests/benchmark.py

@@ -9,7 +9,7 @@
 # WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
 # implied. See the LICENSE-MIT and LICENSE-APACHE files for the
 # specific language governing permissions and limitations under
-# each license.import unittest
+# each license.
 
 import os
 import io
@@ -110,7 +110,7 @@ def test_files_build():
     if os.path.exists(output_path):
         os.remove(output_path)
     with open(test_path, "rb") as source_file:
-        with open(output_path, "wb") as dest_file:
+        with open(output_path, "w+b") as dest_file:
             builder.sign(signer, "image/jpeg", source_file, dest_file)