fix: Udpate libs loading

Author: tmathern

setup.py

@@ -17,28 +17,25 @@ def get_version():
 PLATFORM_EXTENSIONS = {
     'win_amd64': 'dll',
     'win_arm64': 'dll',
-    'macosx_x86_64': 'dylib',
-    'apple-darwin': 'dylib', # we need to update the published keys
+    'apple-darwin': 'dylib', # universal
     'linux_x86_64': 'so',
     'linux_aarch64': 'so',
 }
 
 # Based on what c2pa-rs repo publishes
 PLATFORM_FOLDERS = {
     'universal-apple-darwin': 'dylib',
-    'aarch64-apple-darwin': 'dylib',
-    'x86_64-apple-darwin': 'dylib',
     'x86_64-pc-windows-msvc': 'dll',
     'x86_64-unknown-linux-gnu': 'so',
-    'aarch64-unknown-linux-gnu': 'so',  # Add ARM Linux support
+    'aarch64-unknown-linux-gnu': 'so',
 }
 
 # Directory structure
 ARTIFACTS_DIR = Path('artifacts')  # Where downloaded libraries are stored
 PACKAGE_LIBS_DIR = Path('src/c2pa/libs')  # Where libraries will be copied for the wheel
 
 
-def get_platform_identifier(cpu_arch = None) -> str:
+def get_platform_identifier() -> str:
     """Get a platform identifier (arch-os) for the current system,
     matching downloaded identifiers used by the Github publisher.
 
@@ -47,24 +44,15 @@ def get_platform_identifier(cpu_arch = None) -> str:
             cpu_arch: Optional CPU architecture for macOS. If not provided, returns universal build.
 
     Returns one of:
-    - universal-apple-darwin (for Mac, when cpu_arch is None, fallback)
-    - aarch64-apple-darwin (for Mac ARM64)
-    - x86_64-apple-darwin (for Mac x86_64)
+    - universal-apple-darwin (for macOS)
     - x86_64-pc-windows-msvc (for Windows 64-bit)
     - x86_64-unknown-linux-gnu (for Linux 64-bit)
     - aarch64-unknown-linux-gnu (for Linux ARM64)
     """
     system = platform.system().lower()
 
     if system == "darwin":
-        if cpu_arch is None:
-            return "universal-apple-darwin"
-        elif cpu_arch == "arm64":
-            return "aarch64-apple-darwin"
-        elif cpu_arch == "x86_64":
-            return "x86_64-apple-darwin"
-        else:
-            raise ValueError(f"Unsupported CPU architecture for macOS: {cpu_arch}")
+        return "universal-apple-darwin"
     elif system == "windows":
         return "x86_64-pc-windows-msvc"
     elif system == "linux":

src/c2pa/lib.py

@@ -25,6 +25,7 @@ class CPUArchitecture(Enum):
     """CPU architecture enum for platform-specific identifiers."""
     AARCH64 = "aarch64"
     X86_64 = "x86_64"
+    ARM64 = "arm64"
 
 
 def get_platform_identifier() -> str:
@@ -44,7 +45,7 @@ def get_platform_identifier() -> str:
     elif system == "windows":
         return "x86_64-pc-windows-msvc"
     elif system == "linux":
-        if _get_architecture() in ['arm64', 'aarch64']:
+        if _get_architecture() in [CPUArchitecture.ARM64.value, CPUArchitecture.AARCH64.value]:
             return "aarch64-unknown-linux-gnu"
         return "x86_64-unknown-linux-gnu"
     else:
@@ -61,9 +62,9 @@ def _get_architecture() -> str:
     if sys.platform == "darwin":
         # On macOS, we need to check if we're running under Rosetta
         if platform.processor() == 'arm':
-            return 'arm64'
+            return CPUArchitecture.ARM64.value
         else:
-            return 'x86_64'
+            return CPUArchitecture.X86_64.value
     elif sys.platform == "linux":
         return platform.machine()
     elif sys.platform == "win32":
@@ -251,11 +252,7 @@ def dynamically_load_library(
     # Default path (no library name provided in the environment)
     c2pa_lib = _load_single_library(c2pa_lib_name, possible_paths)
     if not c2pa_lib:
-        logger.error(
-            f"Could not find {c2pa_lib_name} in any of the search paths: {
-                [
-                    str(p) for p in possible_paths]}")
-        raise RuntimeError(
-            f"Could not find {c2pa_lib_name} in any of the search paths")
+        logger.error(f"Could not find {c2pa_lib_name} in any of the search paths: {[str(p) for p in possible_paths]}")
+        raise RuntimeError(f"Could not find {c2pa_lib_name} in any of the search paths")
 
     return c2pa_lib