arcade-core 4.2.1__py3-none-any.whl → 4.2.3__py3-none-any.whl

arcade_core/errors.py

@@ -1,5 +1,4 @@
 import traceback
-import warnings
 from abc import ABC, abstractmethod
 from enum import Enum
 from typing import Any
@@ -230,15 +229,10 @@ class ToolOutputError(ToolSerializationError):
 # 2. ------  tool-body errors ------
 class ToolExecutionError(ToolRuntimeError):
     """
-    DEPRECATED: Raised when there is an error executing a tool.
-
-    ToolExecutionError is deprecated and will be removed in a future major version.
-    Use more specific error types instead:
-    - RetryableToolError for retryable errors
-    - ContextRequiredToolError for errors requiring user context
-    - FatalToolError for fatal/unexpected errors
-    - UpstreamError for upstream service errors
-    - UpstreamRateLimitError for upstream rate limiting errors
+    Raised when an error occurs during the execution of a tool's body.
+
+    This is the base class for tool execution errors and should be raised when catching
+    exceptions within a tool to provide meaningful information to the tool caller.
     """
 
     def __init__(
@@ -248,14 +242,6 @@ class ToolExecutionError(ToolRuntimeError):
         *,
         extra: dict[str, Any] | None = None,
     ):
-        if type(self) is ToolExecutionError:
-            warnings.warn(
-                "ToolExecutionError is deprecated and will be removed in a future major version. "
-                "Use more specific error types instead: RetryableToolError, ContextRequiredToolError, "
-                "FatalToolError, UpstreamError, or UpstreamRateLimitError.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
         super().__init__(message, developer_message=developer_message, extra=extra)
 
 

arcade_core/toolkit.py

@@ -299,32 +299,50 @@ class Toolkit(BaseModel):
         # Skipping this file is necessary because tools are discovered via AST parsing, but those tools
         # aren't in the module's namespace yet since the file is still executing.
         current_file = None
+        current_module_name = None
         main_module = sys.modules.get("__main__")
-        if main_module and hasattr(main_module, "__file__") and main_module.__file__:
-            with contextlib.suppress(Exception):
-                current_file = Path(main_module.__file__).resolve()
+        if main_module:
+            if hasattr(main_module, "__file__") and main_module.__file__:
+                with contextlib.suppress(Exception):
+                    current_file = Path(main_module.__file__).resolve()
+            # Get module name from __spec__ if available (used when paths don't match,
+            # e.g., script runs from bundle but package is in site-packages)
+            main_spec = getattr(main_module, "__spec__", None)
+            if main_spec and main_spec.name:
+                current_module_name = main_spec.name
 
         tools: dict[str, list[str]] = {}
 
         for module_path in modules:
-            # Skip adding tools from the currently executing file
+            # Build import path first (needed for module name comparison in skip logic)
+            relative_path = module_path.relative_to(package_dir)
+            relative_parts = relative_path.with_suffix("").parts
+            import_path = ".".join(relative_parts)
+            if relative_parts and relative_parts[0] == package_name:
+                full_import_path = import_path
+            else:
+                full_import_path = f"{package_name}.{import_path}" if import_path else package_name
+
+            # Skip logic: check by file path OR by module name
+            # This handles cases where the script is run from a different location than
+            # where the package is installed (e.g., deployment scenarios)
+            should_skip = False
             if current_file:
                 try:
                     module_path_resolved = module_path.resolve()
                     if module_path_resolved == current_file:
-                        continue
+                        should_skip = True
                 except Exception:  # noqa: S110
                     pass
 
-            relative_path = module_path.relative_to(package_dir)
+            # Secondary check: compare module names when paths don't match
+            if not should_skip and current_module_name and full_import_path == current_module_name:
+                should_skip = True
+
+            if should_skip:
+                continue
+
             cls.validate_file(module_path)
-            # Build import path and avoid duplicating the package prefix if it already exists
-            relative_parts = relative_path.with_suffix("").parts
-            import_path = ".".join(relative_parts)
-            if relative_parts and relative_parts[0] == package_name:
-                full_import_path = import_path
-            else:
-                full_import_path = f"{package_name}.{import_path}" if import_path else package_name
             tools[full_import_path] = get_tools_from_file(str(module_path))
 
         if not tools:

{arcade_core-4.2.1.dist-info → arcade_core-4.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arcade-core
-Version: 4.2.1
+Version: 4.2.3
 Summary: Arcade Core - Core library for Arcade platform
 Author-email: Arcade <dev@arcade.dev>
 License: MIT
@@ -17,6 +17,7 @@ Requires-Dist: httpx>=0.27.0
 Requires-Dist: loguru>=0.7.0
 Requires-Dist: packaging>=24.1
 Requires-Dist: portalocker>=2.10.0
+Requires-Dist: posthog<7.0.0,>=6.7.6
 Requires-Dist: pydantic>=2.7.0
 Requires-Dist: pyjwt>=2.8.0
 Requires-Dist: pyyaml>=6.0

{arcade_core-4.2.1.dist-info → arcade_core-4.2.3.dist-info}/RECORD

@@ -8,13 +8,13 @@ arcade_core/config_model.py,sha256=EA6XQWj-oJu_e4j0kuVT1K5fbwRvwv-lUYMrctcW2Ws,6
 arcade_core/constants.py,sha256=E3s22aGDhYDM_vkxdo7PZf8F3pznqM-NqQQzgIjhhD8,531
 arcade_core/context.py,sha256=J2MgbVznhJC2qarHq3dTL72W4NGYOM1pjXdI_YwgkA4,3316
 arcade_core/discovery.py,sha256=PluKGhNtJ7RYjJuPDMB8LCNinQLKzlqoAtc3dwKb6IA,8397
-arcade_core/errors.py,sha256=fsi7m6TQQSsdSNHl4rBoSN_YH3ZV910gjvBFqB207f4,13326
+arcade_core/errors.py,sha256=B7Qqmnbi2F_3i8rhC_hyNKS6ApH5DxwBK5wEo-Ui0Tc,12658
 arcade_core/executor.py,sha256=RKUmh0by3CVcNSKSbmuSLhk5TzcWrH8PYOSUhR9tRsI,4333
 arcade_core/output.py,sha256=CMY1pHlQIR27Beiz2I-Yg1aO-P-pbsEbhBZ1RdYuflc,4040
 arcade_core/parse.py,sha256=arKGKL9C6g__tRfZ4re6IM_wAqr1v3LrOzTOBEDLhDc,2366
 arcade_core/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arcade_core/schema.py,sha256=y32Ndlb1b3Hw7_Wm3eVXxh0kSg3oGitWUYBfwFLjHuY,21198
-arcade_core/toolkit.py,sha256=lLlOL6fA6Lmo-dtLTMMcPCzKDf9YQObwxG1LdVADv3E,14431
+arcade_core/toolkit.py,sha256=FO_I-ZVNL7-IPMubfY74Zas_pQKEzwyUvFB9g-aFbgY,15272
 arcade_core/utils.py,sha256=_3bM-yfIDFmMVqt-NFYp2Lx1QcNWp7xytGjUQzPs2LY,3255
 arcade_core/version.py,sha256=CpXi3jGlx23RvRyU7iytOMZrnspdWw4yofS8lpP1AJU,18
 arcade_core/converters/__init__.py,sha256=ckb7c0LCq62_bARxoV7XlRYF7vtGbG1SJnDTWZ9Z7P4,827
@@ -29,6 +29,6 @@ arcade_core/usage/constants.py,sha256=1FQIhkFFMZUhU-H4A7GvMb7KQ3qLFrNAZb2-LEvSF3
 arcade_core/usage/identity.py,sha256=h_THm-cN3j8nqW7_Lew7OdBRA70valCKJ7zvhDvja_E,8416
 arcade_core/usage/usage_service.py,sha256=xzWWSEktm58liiNYugBHRactSru8V5foriHcsoH0j1A,3407
 arcade_core/usage/utils.py,sha256=FqBOmlhwT68cbnpI5Vx9ZW6vLRYPVg4FJ0GaMEp8qEM,398
-arcade_core-4.2.1.dist-info/METADATA,sha256=5lFJ1C5vqqBXHLC51RdiGvHFsddE-JbG69wt8MFydlM,2447
-arcade_core-4.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-arcade_core-4.2.1.dist-info/RECORD,,
+arcade_core-4.2.3.dist-info/METADATA,sha256=FpU3nIosa-NhNT0CkixMXWw4r2dBTzvMdNF2Af4ns9Q,2484
+arcade_core-4.2.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+arcade_core-4.2.3.dist-info/RECORD,,