arcade-core 4.2.0__py3-none-any.whl → 4.2.2__py3-none-any.whl

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/usage/identity.py

@@ -6,7 +6,6 @@ supporting pre-login anonymous tracking, post-login identity stitching,
 and logout identity rotation.
 """
 
-import fcntl
 import json
 import os
 import tempfile
@@ -14,6 +13,7 @@ import uuid
 from typing import Any
 
 import httpx
+import portalocker
 import yaml
 
 from arcade_core.constants import ARCADE_CONFIG_PATH, CREDENTIALS_FILE_PATH
@@ -46,18 +46,16 @@ class UsageIdentity:
         if os.path.exists(self.usage_file_path):
             try:
                 with open(self.usage_file_path) as f:
-                    # lock file
-                    if os.name != "nt":  # Unix-like systems
-                        fcntl.flock(f.fileno(), fcntl.LOCK_SH)
+                    # Lock file for reading (shared lock)
+                    portalocker.lock(f, portalocker.LOCK_SH)
                     try:
                         data = json.load(f)
                         if isinstance(data, dict) and KEY_ANON_ID in data:
                             self._data = data
                             return self._data
                     finally:
-                        # unlock file
-                        if os.name != "nt":
-                            fcntl.flock(f.fileno(), fcntl.LOCK_UN)
+                        # Unlock file
+                        portalocker.unlock(f)
             except Exception:  # noqa: S110
                 pass
 
@@ -80,18 +78,18 @@ class UsageIdentity:
 
         try:
             with os.fdopen(temp_fd, "w") as f:
-                # lock file
-                if os.name != "nt":  # Unix-like systems
-                    fcntl.flock(f.fileno(), fcntl.LOCK_EX)
+                # Lock file for writing (exclusive lock)
+                portalocker.lock(f, portalocker.LOCK_EX)
                 try:
                     json.dump(data, f, indent=2)
                     f.flush()
                     os.fsync(f.fileno())  # ensure data is written to disk
                 finally:
-                    if os.name != "nt":
-                        fcntl.flock(f.fileno(), fcntl.LOCK_UN)
+                    portalocker.unlock(f)
 
-            os.rename(temp_path, self.usage_file_path)
+            # Use os.replace() for cross-platform atomic file replacement
+            # os.replace() is atomic on both Unix and Windows (Python 3.3+)
+            os.replace(temp_path, self.usage_file_path)
         except Exception:
             # clean up
             import contextlib

{arcade_core-4.2.0.dist-info → arcade_core-4.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arcade-core
-Version: 4.2.0
+Version: 4.2.2
 Summary: Arcade Core - Core library for Arcade platform
 Author-email: Arcade <dev@arcade.dev>
 License: MIT
@@ -16,6 +16,8 @@ Requires-Python: >=3.10
 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.0.dist-info → arcade_core-4.2.2.dist-info}/RECORD

@@ -14,7 +14,7 @@ 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
@@ -26,9 +26,9 @@ arcade_core/network/org_transport.py,sha256=DZdIYdldtYZ6gtmWA1C8dXmsNuOv7tePhlpB
 arcade_core/usage/__init__.py,sha256=SUR5mqF-bjdbl-P-OOHN6OFAjXZu4agXyPhr7xdVXCw,234
 arcade_core/usage/__main__.py,sha256=rSJkE1G9hlV3HRRA6EJE5Lmy3wKyan7rAxBXHX9A1cI,1577
 arcade_core/usage/constants.py,sha256=1FQIhkFFMZUhU-H4A7GvMb7KQ3qLFrNAZb2-LEvSF3k,1052
-arcade_core/usage/identity.py,sha256=egclRR26jGP1vVvoOoaaZdcS4AtSTZ8fLHpBq1HRgHw,8452
+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.0.dist-info/METADATA,sha256=9MoBNcEU1QcYlpXatMEe6Lj_OhbJUKCuyaCuZ0FQ52E,2412
-arcade_core-4.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-arcade_core-4.2.0.dist-info/RECORD,,
+arcade_core-4.2.2.dist-info/METADATA,sha256=F4w5igIIi19asDJdZmVrSIWS6NREaQdKTqbfUw1etDg,2484
+arcade_core-4.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+arcade_core-4.2.2.dist-info/RECORD,,