fix: Test API redirect

Author: tmathern

src/c2pa/c2pa.py

@@ -1754,6 +1754,7 @@ def add_resource(self, uri: str, stream: Any):
 
     def add_ingredient(self, ingredient_json: str, format: str, source: Any):
         """Add an ingredient to the builder.
+        The added ingredient's source should be a stream-like object, eg. and open file.
 
         Args:
             ingredient_json: The JSON ingredient definition
@@ -1772,6 +1773,7 @@ def add_ingredient_from_stream(
             format: str,
             source: Any):
         """Add an ingredient from a stream to the builder.
+        Explicitly named API requiring a stream.
 
         Args:
             ingredient_json: The JSON ingredient definition
@@ -1804,6 +1806,44 @@ def add_ingredient_from_stream(
                 raise C2paError(
                     Builder._ERROR_MESSAGES['ingredient_error'].format("Unknown error"))
 
+    def add_ingredient_from_file_path(
+            self,
+            ingredient_json: str,
+            format: str,
+            filepath: str):
+        """Add an ingredient from a file path to the builder.
+        THis is a legacy method.
+
+        .. deprecated:: 0.13.0
+           This method is deprecated and will be removed in a future version.
+           Use :meth:`add_ingredient` with a file stream instead.
+
+        Args:
+            ingredient_json: The JSON ingredient definition
+            format: The MIME type or extension of the ingredient
+            filepath: The path to the file containing the ingredient data
+
+        Raises:
+            C2paError: If there was an error adding the ingredient
+            C2paError.Encoding: If the ingredient JSON or format contains invalid UTF-8 characters
+            FileNotFoundError: If the file at the specified path does not exist
+        """
+        warnings.warn(
+            "add_ingredient_from_file_path is deprecated and will be removed in a future version. "
+            "Use add_ingredient with a file stream instead.",
+            DeprecationWarning,
+            stacklevel=2
+        )
+
+        try:
+            with open(filepath, 'rb') as file_stream:
+                self.add_ingredient_from_stream(ingredient_json, format, file_stream)
+        except FileNotFoundError:
+            raise FileNotFoundError(f"File not found: {filepath}")
+        except Exception as e:
+            # Re-raise C2paError and other exceptions as-is
+            raise e
+
     def to_archive(self, stream: Any):
         """Write an archive of the builder to a stream.
 

tests/test_unit_tests.py

@@ -15,7 +15,6 @@
 import io
 import json
 import unittest
-from unittest.mock import mock_open, patch
 import ctypes
 import warnings
 from cryptography.hazmat.primitives import hashes, serialization
@@ -1347,6 +1346,64 @@ def test_signing_manifest_v2(self):
 
                 output.close()
 
+    def test_builder_add_ingredient_from_file_path(self):
+        """Test Builder class add_ingredient_from_file_path method."""
+        # Suppress the specific deprecation warning for this test, as this is a legacy method
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+
+            # Test creating builder from JSON
+            builder = Builder.from_json(self.manifestDefinition)
+            assert builder._builder is not None
+
+            # Test adding ingredient from file path
+            ingredient_json = '{"test": "ingredient_from_file_path"}'
+            builder.add_ingredient_from_file_path(ingredient_json, "image/jpeg", self.testPath)
+
+            builder.close()
+
+    def test_builder_sign_with_ingredient_from_file(self):
+        """Test Builder class operations with an ingredient added from file path."""
+        # Test creating builder from JSON
+        builder = Builder.from_json(self.manifestDefinition)
+        assert builder._builder is not None
+
+        # Test adding ingredient from file path
+        ingredient_json = '{"title": "Test Ingredient From File"}'
+        # Suppress the specific deprecation warning for this test, as this is a legacy method
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            builder.add_ingredient_from_file_path(ingredient_json, "image/jpeg", self.testPath3)
+
+        with open(self.testPath2, "rb") as file:
+            output = io.BytesIO(bytearray())
+            builder.sign(self.signer, "image/jpeg", file, output)
+            output.seek(0)
+            reader = Reader("image/jpeg", output)
+            json_data = reader.json()
+            manifest_data = json.loads(json_data)
+
+            # Verify active manifest exists
+            self.assertIn("active_manifest", manifest_data)
+            active_manifest_id = manifest_data["active_manifest"]
+
+            # Verify active manifest object exists
+            self.assertIn("manifests", manifest_data)
+            self.assertIn(active_manifest_id, manifest_data["manifests"])
+            active_manifest = manifest_data["manifests"][active_manifest_id]
+
+            # Verify ingredients array exists in active manifest
+            self.assertIn("ingredients", active_manifest)
+            self.assertIsInstance(active_manifest["ingredients"], list)
+            self.assertTrue(len(active_manifest["ingredients"]) > 0)
+
+            # Verify the first ingredient's title matches what we set
+            first_ingredient = active_manifest["ingredients"][0]
+            self.assertEqual(first_ingredient["title"], "Test Ingredient From File")
+
+        builder.close()
+
+
 class TestStream(unittest.TestCase):
     def setUp(self):
         # Create a temporary file for testing