fix: Refactor

Author: tmathern

src/c2pa/c2pa.py

@@ -1753,7 +1753,7 @@ def add_resource(self, uri: str, stream: Any):
                     Builder._ERROR_MESSAGES['resource_error'].format("Unknown error"))
 
     def add_ingredient(self, ingredient_json: str, format: str, source: Any):
-        """Add an ingredient to the builder.
+        """Add an ingredient to the builder (facade method).
         The added ingredient's source should be a stream-like object, eg. and open file.
 
         Args:
@@ -1836,12 +1836,12 @@ def add_ingredient_from_file_path(
         )
 
         try:
+            # Does the stream handling to use add_ingredient_from_stream
             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):

tests/test_unit_tests.py

@@ -1348,13 +1348,12 @@ def test_signing_manifest_v2(self):
 
     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"}'
@@ -1364,9 +1363,8 @@ def test_builder_add_ingredient_from_file_path(self):
 
     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"}'