fix: Reorg code

Author: tmathern

src/c2pa/c2pa.py

@@ -1705,28 +1705,6 @@ class Signer:
         'encoding_error': "Invalid UTF-8 characters in input: {}"
     }
 
-    def __init__(self, signer_ptr: ctypes.POINTER(C2paSigner)):
-        """Initialize a new Signer instance.
-
-        Note: This constructor is not meant to be called directly.
-        Use from_info() or from_callback() instead.
-
-        Args:
-            signer_ptr: Pointer to the native C2PA signer
-
-        Raises:
-            C2paError: If the signer pointer is invalid
-        """
-        # Validate pointer before assignment
-        if not signer_ptr:
-            raise C2paError("Invalid signer pointer: pointer is null")
-
-        self._signer = signer_ptr
-        self._closed = False
-
-        # Set only for signers which are callback signers
-        self._callback_cb = None
-
     @classmethod
     def from_info(cls, signer_info: C2paSignerInfo) -> 'Signer':
         """Create a new Signer from signer information.
@@ -1893,6 +1871,28 @@ def wrapped_callback(
 
         return signer_instance
 
+    def __init__(self, signer_ptr: ctypes.POINTER(C2paSigner)):
+        """Initialize a new Signer instance.
+
+        Note: This constructor is not meant to be called directly.
+        Use from_info() or from_callback() instead.
+
+        Args:
+            signer_ptr: Pointer to the native C2PA signer
+
+        Raises:
+            C2paError: If the signer pointer is invalid
+        """
+        # Validate pointer before assignment
+        if not signer_ptr:
+            raise C2paError("Invalid signer pointer: pointer is null")
+
+        self._signer = signer_ptr
+        self._closed = False
+
+        # Set only for signers which are callback signers
+        self._callback_cb = None
+
     def __enter__(self):
         """Context manager entry."""
         self._ensure_valid_state()
@@ -2092,6 +2092,51 @@ def get_supported_mime_types(cls) -> list[str]:
 
         return cls._supported_mime_types_cache
 
+    @classmethod
+    def from_json(cls, manifest_json: Any) -> 'Builder':
+        """Create a new Builder from a JSON manifest.
+
+        Args:
+            manifest_json: The JSON manifest definition
+
+        Returns:
+            A new Builder instance
+
+        Raises:
+            C2paError: If there was an error creating the builder
+        """
+        return cls(manifest_json)
+
+    @classmethod
+    def from_archive(cls, stream: Any) -> 'Builder':
+        """Create a new Builder from an archive stream.
+
+        Args:
+            stream: The stream containing the archive
+                (any Python stream-like object)
+
+        Returns:
+            A new Builder instance
+
+        Raises:
+            C2paError: If there was an error creating the builder from archive
+        """
+        builder = cls({})
+        stream_obj = Stream(stream)
+        builder._builder = _lib.c2pa_builder_from_archive(stream_obj._stream)
+
+        if not builder._builder:
+            # Clean up the stream object if builder creation fails
+            stream_obj.close()
+
+            error = _parse_operation_result_for_error(_lib.c2pa_error())
+            if error:
+                raise C2paError(error)
+            raise C2paError("Failed to create builder from archive")
+
+        builder._initialized = True
+        return builder
+
     def __init__(self, manifest_json: Any):
         """Initialize a new Builder instance.
 
@@ -2136,50 +2181,16 @@ def __init__(self, manifest_json: Any):
 
         self._initialized = True
 
-    @classmethod
-    def from_json(cls, manifest_json: Any) -> 'Builder':
-        """Create a new Builder from a JSON manifest.
-
-        Args:
-            manifest_json: The JSON manifest definition
-
-        Returns:
-            A new Builder instance
-
-        Raises:
-            C2paError: If there was an error creating the builder
-        """
-        return cls(manifest_json)
-
-    @classmethod
-    def from_archive(cls, stream: Any) -> 'Builder':
-        """Create a new Builder from an archive stream.
-
-        Args:
-            stream: The stream containing the archive
-                (any Python stream-like object)
-
-        Returns:
-            A new Builder instance
-
-        Raises:
-            C2paError: If there was an error creating the builder from archive
-        """
-        builder = cls({})
-        stream_obj = Stream(stream)
-        builder._builder = _lib.c2pa_builder_from_archive(stream_obj._stream)
-
-        if not builder._builder:
-            # Clean up the stream object if builder creation fails
-            stream_obj.close()
+    def __del__(self):
+        """Ensure resources are cleaned up if close() wasn't called."""
+        self._cleanup_resources()
 
-            error = _parse_operation_result_for_error(_lib.c2pa_error())
-            if error:
-                raise C2paError(error)
-            raise C2paError("Failed to create builder from archive")
+    def __enter__(self):
+        self._ensure_valid_state()
+        return self
 
-        builder._initialized = True
-        return builder
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()
 
     def _ensure_valid_state(self):
         """Ensure the builder is in a valid state for operations.
@@ -2225,10 +2236,6 @@ def _cleanup_resources(self):
             # Ensure we don't raise exceptions during cleanup
             pass
 
-    def __del__(self):
-        """Ensure resources are cleaned up if close() wasn't called."""
-        self._cleanup_resources()
-
     def close(self):
         """Release the builder resources.
 
@@ -2251,13 +2258,6 @@ def close(self):
         finally:
             self._closed = True
 
-    def __enter__(self):
-        self._ensure_valid_state()
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.close()
-
     def set_no_embed(self):
         """Set the no-embed flag.