arcade-core 4.2.1__tar.gz → 4.2.2__tar.gz

{arcade_core-4.2.1 → arcade_core-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arcade-core
-Version: 4.2.1
+Version: 4.2.2
 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 → arcade_core-4.2.2}/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 → arcade_core-4.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arcade-core"
-version = "4.2.1"
+version = "4.2.2"
 description = "Arcade Core - Core library for Arcade platform"
 readme = "README.md"
 license = { text = "MIT" }
@@ -28,6 +28,7 @@ dependencies = [
     "types-python-dateutil==2.9.0.20241003",
     "types-pytz==2024.2.0.20241003",
     "types-toml==0.10.8.20240310",
+    "posthog>=6.7.6,<7.0.0",
 ]
 
 [project.optional-dependencies]