From 7134ba7359d87686c0a4c168acc1b8799a93bd0b Mon Sep 17 00:00:00 2001 From: rick-five <165170199+rick-five@users.noreply.github.com> Date: Tue, 11 Nov 2025 21:06:19 +0800 Subject: [PATCH 1/3] Add files via upload --- minigu/python/__init__.py | 9 ++------- minigu/python/minigu.py | 27 +++------------------------ 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/minigu/python/__init__.py b/minigu/python/__init__.py index 6b4047bbf..b23cf97c7 100644 --- a/minigu/python/__init__.py +++ b/minigu/python/__init__.py @@ -40,13 +40,8 @@ HAS_RUST_BINDINGS = True PyMiniGU = minigu_python.PyMiniGU # Try to import the error checking functions - try: - is_transaction_error = minigu_python.is_transaction_error - is_not_implemented_error = minigu_python.is_not_implemented_error - except AttributeError: - # Fallback if these functions are not available - is_transaction_error = None - is_not_implemented_error = None + is_transaction_error = getattr(minigu_python, 'is_transaction_error', None) + is_not_implemented_error = getattr(minigu_python, 'is_not_implemented_error', None) except ImportError as e: # Fallback if the Rust extension is not available HAS_RUST_BINDINGS = False diff --git a/minigu/python/minigu.py b/minigu/python/minigu.py index e2f1bacef..ca761ec79 100644 --- a/minigu/python/minigu.py +++ b/minigu/python/minigu.py @@ -13,32 +13,11 @@ # Import from package __init__.py - this is the primary way to get the Rust bindings try: - from . import HAS_RUST_BINDINGS, PyMiniGU - # Try to import the error checking functions - try: - from . import is_transaction_error, is_not_implemented_error - except ImportError: - # Fallback if these functions are not available - is_transaction_error = None - is_not_implemented_error = None + from . import HAS_RUST_BINDINGS, PyMiniGU, is_transaction_error, is_not_implemented_error except ImportError: # Fallback when running directly or if package imports fail - try: - import minigu_python - HAS_RUST_BINDINGS = True - PyMiniGU = minigu_python.PyMiniGU - # Try to import the error checking functions - try: - is_transaction_error = minigu_python.is_transaction_error - is_not_implemented_error = minigu_python.is_not_implemented_error - except AttributeError: - # Fallback if these functions are not available - is_transaction_error = None - is_not_implemented_error = None - except (ImportError, ModuleNotFoundError): - # No longer provide simulated implementation warning, directly raise exception - HAS_RUST_BINDINGS = False - raise ImportError("Rust bindings not available. miniGU requires Rust bindings to function.") + HAS_RUST_BINDINGS = False + raise ImportError("Rust bindings not available. miniGU requires Rust bindings to function.") def _handle_exception(e: Exception) -> None: From 0a3f74ea94e281600bd6970cae93a29be015652b Mon Sep 17 00:00:00 2001 From: rick-five <165170199+rick-five@users.noreply.github.com> Date: Tue, 11 Nov 2025 21:13:10 +0800 Subject: [PATCH 2/3] Add files via upload --- minigu/python/minigu.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/minigu/python/minigu.py b/minigu/python/minigu.py index ca761ec79..8749517f4 100644 --- a/minigu/python/minigu.py +++ b/minigu/python/minigu.py @@ -14,10 +14,24 @@ # Import from package __init__.py - this is the primary way to get the Rust bindings try: from . import HAS_RUST_BINDINGS, PyMiniGU, is_transaction_error, is_not_implemented_error -except ImportError: +except (ImportError, ModuleNotFoundError): # Fallback when running directly or if package imports fail - HAS_RUST_BINDINGS = False - raise ImportError("Rust bindings not available. miniGU requires Rust bindings to function.") + try: + import minigu_python + HAS_RUST_BINDINGS = True + PyMiniGU = minigu_python.PyMiniGU + # Try to import the error checking functions + try: + is_transaction_error = minigu_python.is_transaction_error + is_not_implemented_error = minigu_python.is_not_implemented_error + except AttributeError: + # Fallback if these functions are not available + is_transaction_error = None + is_not_implemented_error = None + except (ImportError, ModuleNotFoundError): + # No longer provide simulated implementation warning, directly raise exception + HAS_RUST_BINDINGS = False + raise ImportError("Rust bindings not available. miniGU requires Rust bindings to function.") def _handle_exception(e: Exception) -> None: From 0f59e1ed44c00e72cf18154c17b06306f8676662 Mon Sep 17 00:00:00 2001 From: rick-five <165170199+rick-five@users.noreply.github.com> Date: Tue, 11 Nov 2025 21:31:28 +0800 Subject: [PATCH 3/3] Update .gitignore