contentauth
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Makefile‎
Lines changed: 6 additions & 1 deletion b/‎Makefile‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎requirements.txt‎
Lines changed: 1 addition & 1 deletion b/‎requirements.txt‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/c2pa/__init__.py‎
Lines changed: 4 additions & 2 deletions b/‎src/c2pa/__init__.py‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎src/c2pa/c2pa.py‎
Lines changed: 96 additions & 46 deletions b/‎src/c2pa/c2pa.py‎
Lines changed: 96 additions & 46 deletions
@@ -5,6 +5,7 @@ __pycache__/
 
 /artifacts
 scripts/artifacts
+tests/fixtures/temp_data
 
 
 # C extensions
 
@@ -33,6 +33,11 @@ rebuild: clean-c2pa-env install-deps download-native-artifacts build-python
 # Runs the unit tests
 test:
 	python3 ./tests/test_unit_tests.py
+	python3 ./tests/test_unit_tests_threaded.py
+
+# Runs benchmarks in the venv
+benchmark:
+	python -m pytest tests/benchmark.py -v
 
 # Tests building and installing a local wheel package
 # Downloads required artifacts, builds the wheel, installs it, and verifies the installation
@@ -84,7 +89,7 @@ publish: release
 
 # Formats Python source code using autopep8 with aggressive settings
 format:
-	autopep8 --aggressive --aggressive --in-place src/c2pa/*.py
+	autopep8 --aggressive --aggressive --in-place src/c2pa/**/*.py
 
 # Downloads the required native artifacts for the specified version
 download-native-artifacts:
 
@@ -1,2 +1,2 @@
 # only used in the training example
-cryptography>=41.0.0
+cryptography>=45.0.3
@@ -12,7 +12,8 @@
     C2paSignerInfo,
     Signer,
     Stream,
-    sdk_version
+    sdk_version,
+    read_ingredient_file
 )  # NOQA
 
 # Re-export C2paError and its subclasses
@@ -24,5 +25,6 @@
     'C2paSignerInfo',
     'Signer',
     'Stream',
-    'sdk_version'
+    'sdk_version',
+    'read_ingredient_file'
 ]
@@ -3,10 +3,12 @@
 import json
 import sys
 import os
+import warnings
 from pathlib import Path
 from typing import Optional, Union, Callable, Any
 import time
 from .lib import dynamically_load_library
+import mimetypes
 
 # Define required function names
 _REQUIRED_FUNCTIONS = [
@@ -16,7 +18,6 @@
     'c2pa_load_settings',
     'c2pa_read_file',
     'c2pa_read_ingredient_file',
-    'c2pa_sign_file',
     'c2pa_reader_from_stream',
     'c2pa_reader_from_manifest_data_and_stream',
     'c2pa_reader_free',
@@ -247,13 +248,6 @@ def _setup_function(func, argtypes, restype=None):
 _setup_function(
     _lib.c2pa_read_ingredient_file, [
         ctypes.c_char_p, ctypes.c_char_p], ctypes.c_void_p)
-_setup_function(_lib.c2pa_sign_file,
-                [ctypes.c_char_p,
-                 ctypes.c_char_p,
-                 ctypes.c_char_p,
-                 ctypes.POINTER(C2paSignerInfo),
-                 ctypes.c_char_p],
-                ctypes.c_void_p)
 
 # Set up Reader and Builder function prototypes
 _setup_function(_lib.c2pa_reader_from_stream,
@@ -496,7 +490,7 @@ def _parse_operation_result_for_error(
 
 def sdk_version() -> str:
     """
-    Returns the c2pa-rs version string, e.g., "0.49.5".
+    Returns the underlying c2pa-rs version string, e.g., "0.49.5".
     """
     vstr = version()
     # Example: "c2pa-c/0.49.5 c2pa-rs/0.49.5"
@@ -536,52 +530,66 @@ def load_settings(settings: str, format: str = "json") -> None:
             raise C2paError(error)
 
 
-def read_file(path: Union[str, Path],
-              data_dir: Optional[Union[str, Path]] = None) -> str:
-    """Read a C2PA manifest from a file.
+def read_ingredient_file(
+        path: Union[str, Path], data_dir: Union[str, Path]) -> str:
+    """Read a C2PA ingredient from a file.
 
     Args:
         path: Path to the file to read
-        data_dir: Optional directory to write binary resources to
+        data_dir: Directory to write binary resources to
 
     Returns:
-        The manifest as a JSON string
+        The ingredient as a JSON string
 
     Raises:
         C2paError: If there was an error reading the file
     """
     container = _StringContainer()
 
     container._path_str = str(path).encode('utf-8')
-    container._data_dir_str = str(data_dir).encode(
-        'utf-8') if data_dir else None
+    container._data_dir_str = str(data_dir).encode('utf-8')
 
-    result = _lib.c2pa_read_file(container._path_str, container._data_dir_str)
+    result = _lib.c2pa_read_ingredient_file(
+        container._path_str, container._data_dir_str)
     return _parse_operation_result_for_error(result)
 
 
-def read_ingredient_file(
-        path: Union[str, Path], data_dir: Optional[Union[str, Path]] = None) -> str:
-    """Read a C2PA ingredient from a file.
+def read_file(path: Union[str, Path],
+              data_dir: Union[str, Path]) -> str:
+    """Read a C2PA manifest from a file.
+
+    .. deprecated:: 0.10.0
+        This function is deprecated and will be removed in a future version.
+        Please use the Reader class for reading C2PA metadata instead.
+        Example:
+            ```python
+            with Reader(path) as reader:
+                manifest_json = reader.json()
+            ```
 
     Args:
         path: Path to the file to read
-        data_dir: Optional directory to write binary resources to
+        data_dir: Directory to write binary resources to
 
     Returns:
-        The ingredient as a JSON string
+        The manifest as a JSON string
 
     Raises:
         C2paError: If there was an error reading the file
     """
+    warnings.warn(
+        "The read_file function is deprecated and will be removed in a future version. "
+        "Please use the Reader class for reading C2PA metadata instead.",
+        DeprecationWarning,
+        stacklevel=2
+    )
+
     container = _StringContainer()
 
     container._path_str = str(path).encode('utf-8')
-    container._data_dir_str = str(data_dir).encode(
-        'utf-8') if data_dir else None
+    container._data_dir_str = str(data_dir).encode('utf-8')
 
-    result = _lib.c2pa_read_ingredient_file(
-        container._path_str, container._data_dir_str)
+    result = _lib.c2pa_read_file(container._path_str, container._data_dir_str)
     return _parse_operation_result_for_error(result)
 
 
@@ -593,6 +601,11 @@ def sign_file(
     data_dir: Optional[Union[str, Path]] = None
 ) -> str:
     """Sign a file with a C2PA manifest.
+    For now, this function is left here to provide a backwards-compatible API.
+
+    .. deprecated:: 0.10.0
+        This function is deprecated and will be removed in a future version.
+        Please use the Builder class for signing and the Reader class for reading signed data instead.
 
     Args:
         source_path: Path to the source file
@@ -602,31 +615,68 @@ def sign_file(
         data_dir: Optional directory to write binary resources to
 
     Returns:
-        Result information as a JSON string
+        The signed manifest as a JSON string
 
     Raises:
         C2paError: If there was an error signing the file
         C2paError.Encoding: If any of the string inputs contain invalid UTF-8 characters
+        C2paError.NotSupported: If the file type cannot be determined
     """
-    # Store encoded strings as attributes of signer_info to keep them alive
-    try:
-        signer_info._source_str = str(source_path).encode('utf-8')
-        signer_info._dest_str = str(dest_path).encode('utf-8')
-        signer_info._manifest_str = manifest.encode('utf-8')
-        signer_info._data_dir_str = str(data_dir).encode(
-            'utf-8') if data_dir else None
-    except UnicodeError as e:
-        raise C2paError.Encoding(
-            f"Invalid UTF-8 characters in input strings: {str(e)}")
-
-    result = _lib.c2pa_sign_file(
-        signer_info._source_str,
-        signer_info._dest_str,
-        signer_info._manifest_str,
-        ctypes.byref(signer_info),
-        signer_info._data_dir_str
+    warnings.warn(
+        "The sign_file function is deprecated and will be removed in a future version. "
+        "Please use the Builder class for signing and the Reader class for reading signed data instead.",
+        DeprecationWarning,
+        stacklevel=2
     )
-    return _parse_operation_result_for_error(result)
+
+    try:
+        # Create a signer from the signer info
+        signer = Signer.from_info(signer_info)
+
+        # Create a builder from the manifest
+        builder = Builder(manifest)
+
+        # Open source and destination files
+        with open(source_path, 'rb') as source_file, open(dest_path, 'wb') as dest_file:
+            # 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}")
+
+            # Sign the file using the builder
+            manifest_bytes = builder.sign(
+                signer=signer,
+                format=mime_type,
+                source=source_file,
+                dest=dest_file
+            )
+
+            # If we have manifest bytes and a data directory, write them
+            if manifest_bytes and data_dir:
+                manifest_path = os.path.join(str(data_dir), 'manifest.json')
+                with open(manifest_path, 'wb') as f:
+                    f.write(manifest_bytes)
+
+            # Read the signed manifest from the destination file
+            with Reader(dest_path) as reader:
+                return reader.json()
+
+    except Exception as e:
+        # Clean up destination file if it exists and there was an error
+        if os.path.exists(dest_path):
+            try:
+                os.remove(dest_path)
+            except OSError:
+                pass  # Ignore cleanup errors
+
+        # Re-raise the error
+        raise C2paError(f"Error signing file: {str(e)}")
+    finally:
+        # Ensure resources are cleaned up
+        if 'builder' in locals():
+            builder.close()
+        if 'signer' in locals():
+            signer.close()
 
 
 class Stream:
@@ -960,7 +1010,7 @@ def __init__(self,
 
             path = str(format_or_path)
             mime_type = mimetypes.guess_type(
-                path)[0] or 'application/octet-stream'
+                path)[0]
 
             # Keep mime_type string alive
             try:
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# only used in the training example`
`2`		`-cryptography>=41.0.0`
	`2`	`+cryptography>=45.0.3`