fix: fix a bug found by tests

Author: tmathern

src/c2pa/c2pa.py

@@ -537,12 +537,12 @@ def load_settings(settings: str, format: str = "json") -> None:
 
 
 def read_file(path: Union[str, Path],
-              data_dir: Optional[Union[str, Path]] = None) -> str:
+              data_dir: Union[str, Path]) -> str:
     """Read a C2PA manifest 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
@@ -553,20 +553,19 @@ def read_file(path: Union[str, Path],
     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)
     return _parse_operation_result_for_error(result)
 
 
 def read_ingredient_file(
-        path: Union[str, Path], data_dir: Optional[Union[str, Path]] = None) -> str:
+        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 ingredient as a JSON string
@@ -577,8 +576,7 @@ def read_ingredient_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_ingredient_file(
         container._path_str, container._data_dir_str)

tests/fixtures/temp_data/manifest.json

@@ -0,0 +1,98 @@
+{
+  "active_manifest": "contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e",
+  "manifests": {
+    "contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e": {
+      "claim_generator": "make_test_images/0.26.0 c2pa-rs/0.26.0",
+      "title": "C.jpg",
+      "format": "image/jpeg",
+      "instance_id": "xmp:iid:939a4c48-0dff-44ec-8f95-61f52b11618f",
+      "thumbnail": {
+        "format": "image/jpeg",
+        "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
+      },
+      "ingredients": [],
+      "assertions": [
+        {
+          "label": "stds.schema-org.CreativeWork",
+          "data": {
+            "@context": "http://schema.org/",
+            "@type": "CreativeWork",
+            "author": [
+              {
+                "@type": "Person",
+                "name": "Adobe make_test"
+              }
+            ]
+          },
+          "kind": "Json"
+        },
+        {
+          "label": "c2pa.actions",
+          "data": {
+            "actions": [
+              {
+                "action": "c2pa.created",
+                "softwareAgent": "Make Test Images 0.26.0",
+                "parameters": {
+                  "name": "gradient"
+                },
+                "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia"
+              }
+            ]
+          }
+        }
+      ],
+      "signature_info": {
+        "alg": "Ps256",
+        "issuer": "C2PA Test Signing Cert",
+        "cert_serial_number": "720724073027128164015125666832722375746636448153",
+        "time": "2023-09-29T17:40:14+00:00"
+      },
+      "label": "contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e"
+    }
+  },
+  "validation_results": {
+    "activeManifest": {
+      "success": [
+        {
+          "code": "claimSignature.insideValidity",
+          "url": "self#jumbf=/c2pa/contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e/c2pa.signature",
+          "explanation": "claim signature valid"
+        },
+        {
+          "code": "claimSignature.validated",
+          "url": "self#jumbf=/c2pa/contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e/c2pa.signature",
+          "explanation": "claim signature valid"
+        },
+        {
+          "code": "assertion.hashedURI.match",
+          "url": "self#jumbf=/c2pa/contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e/c2pa.assertions/c2pa.thumbnail.claim.jpeg",
+          "explanation": "hashed uri matched: self#jumbf=c2pa.assertions/c2pa.thumbnail.claim.jpeg"
+        },
+        {
+          "code": "assertion.hashedURI.match",
+          "url": "self#jumbf=/c2pa/contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e/c2pa.assertions/stds.schema-org.CreativeWork",
+          "explanation": "hashed uri matched: self#jumbf=c2pa.assertions/stds.schema-org.CreativeWork"
+        },
+        {
+          "code": "assertion.hashedURI.match",
+          "url": "self#jumbf=/c2pa/contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e/c2pa.assertions/c2pa.actions",
+          "explanation": "hashed uri matched: self#jumbf=c2pa.assertions/c2pa.actions"
+        },
+        {
+          "code": "assertion.hashedURI.match",
+          "url": "self#jumbf=/c2pa/contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e/c2pa.assertions/c2pa.hash.data",
+          "explanation": "hashed uri matched: self#jumbf=c2pa.assertions/c2pa.hash.data"
+        },
+        {
+          "code": "assertion.dataHash.match",
+          "url": "self#jumbf=/c2pa/contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e/c2pa.assertions/c2pa.hash.data",
+          "explanation": "data hash valid"
+        }
+      ],
+      "informational": [],
+      "failure": []
+    }
+  },
+  "validation_state": "Valid"
+}

tests/fixtures/temp_data/manifest_data-2.c2pa

@@ -19,7 +19,7 @@
 import ctypes
 
 from c2pa import Builder, C2paError as Error, Reader, C2paSigningAlg as SigningAlg, C2paSignerInfo, Signer, sdk_version
-from c2pa.c2pa import Stream, read_ingredient_file
+from c2pa.c2pa import Stream, read_ingredient_file, read_file
 
 PROJECT_PATH = os.getcwd()
 
@@ -682,12 +682,29 @@ def test_read_ingredient_file(self):
 
         ingredient_json_with_dir = read_ingredient_file(self.testPath, temp_data_dir)
 
-        # Parse the JSON and verify specific ingredient fields
+        # Verify some fields
         ingredient_data = json.loads(ingredient_json_with_dir)
         self.assertEqual(ingredient_data["title"], "C.jpg")
         self.assertEqual(ingredient_data["format"], "image/jpeg")
         self.assertIn("thumbnail", ingredient_data)
 
+    def test_read_file(self):
+        """Test reading a C2PA ingredient from a file."""
+        temp_data_dir = os.path.join(self.data_dir, "temp_data")
+        os.makedirs(temp_data_dir, exist_ok=True)
+
+        # self.testPath has C2PA metadata to read
+        file_json_with_dir = read_file(self.testPath, temp_data_dir)
+
+        # Parse the JSON and verify specific fields
+        file_data = json.loads(file_json_with_dir)
+        expected_manifest_id = "contentauth:urn:uuid:c85a2b90-f1a0-4aa4-b17f-f938b475804e"
+
+        # Verify some fields
+        self.assertEqual(file_data["active_manifest"], expected_manifest_id)
+        self.assertIn("manifests", file_data)
+        self.assertIn(expected_manifest_id, file_data["manifests"])
+
 
 if __name__ == '__main__':
     unittest.main()