arcade-core 3.2.0__py3-none-any.whl → 3.3.1__py3-none-any.whl

arcade_core/catalog.py

@@ -255,11 +255,17 @@ class ToolCatalog(BaseModel):
             output_model=output_model,
         )
 
-    def add_module(self, module: ModuleType) -> None:
+    def add_module(self, module: ModuleType, name: str | None = None) -> None:
         """
         Add all the tools in a module to the catalog.
+
+        Args:
+            module: The module to add.
+            name: Optionally override the name of the toolkit with this parameter
         """
         toolkit = Toolkit.from_module(module)
+        if name:
+            toolkit.name = name
         self.add_toolkit(toolkit)
 
     def add_toolkit(self, toolkit: Toolkit) -> None:
@@ -277,7 +283,6 @@ class ToolCatalog(BaseModel):
                     module = import_module(module_name)
                     tool_func = getattr(module, tool_name)
                     self.add_tool(tool_func, toolkit, module)
-
                 except ToolDefinitionError as e:
                     raise e.with_context(tool_name) from e
                 except ToolkitLoadError as e:

arcade_core/toolkit.py

@@ -1,7 +1,9 @@
+import contextlib
 import importlib.metadata
 import importlib.util
 import logging
 import os
+import sys
 import types
 from collections import defaultdict
 from pathlib import Path, PurePosixPath, PureWindowsPath
@@ -293,9 +295,27 @@ class Toolkit(BaseModel):
                 f"Failed to locate Python files in package directory for '{package_name}'."
             ) from e
 
+        # Get the currently executing file (the entrypoint file) so that we can skip it when loading tools.
+        # 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
+        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()
+
         tools: dict[str, list[str]] = {}
 
         for module_path in modules:
+            # Skip adding tools from the currently executing file
+            if current_file:
+                try:
+                    module_path_resolved = module_path.resolve()
+                    if module_path_resolved == current_file:
+                        continue
+                except Exception:  # noqa: S110
+                    pass
+
             relative_path = module_path.relative_to(package_dir)
             cls.validate_file(module_path)
             # Build import path and avoid duplicating the package prefix if it already exists

{arcade_core-3.2.0.dist-info → arcade_core-3.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arcade-core
-Version: 3.2.0
+Version: 3.3.1
 Summary: Arcade Core - Core library for Arcade platform
 Author-email: Arcade <dev@arcade.dev>
 License: MIT

{arcade_core-3.2.0.dist-info → arcade_core-3.3.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 arcade_core/__init__.py,sha256=1heu3AROAjpistehPzY2H-2nkj_IjQEh-vVlVOCRF1E,88
 arcade_core/annotations.py,sha256=Nst6aejLWXlpTu7GwzWETu1gQCG1XVAUR_qcFbNvyRc,198
 arcade_core/auth.py,sha256=On9sJPOxvHjKBxgKC1yqp7oijF6KYBsG6fG8KUw-9OY,5882
-arcade_core/catalog.py,sha256=PePU80MWXVuEGDzzPDvdoCUcGmV-1Ea82H0sPIOUsHA,41860
+arcade_core/catalog.py,sha256=vAXAvdalLq1YymHw46Yq-mUiVb-DTFsup4599E9GUCw,42069
 arcade_core/config.py,sha256=e98XQAkYySGW9T_yrJg54BB8Wuq06GPVHp7xqe2d1vU,572
 arcade_core/config_model.py,sha256=78BR6Ch9BDuG4ddWGfpuEKqWcb1fyOF6kxiF4qLFogM,4481
 arcade_core/constants.py,sha256=wakdklI7TyJ0agq9n-Cmb2lbVa95D0oUaMGm30eiv9Y,375
@@ -13,7 +13,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=l1eE4__sliPIMOp70YxQMlEIpiYQWlBUWEUvr9K1wxA,16927
-arcade_core/toolkit.py,sha256=ouShX7fIp0vVTdfuN9FiCCKIC40wc7JiMpG4MP8ZPLQ,13477
+arcade_core/toolkit.py,sha256=lLlOL6fA6Lmo-dtLTMMcPCzKDf9YQObwxG1LdVADv3E,14431
 arcade_core/utils.py,sha256=_3bM-yfIDFmMVqt-NFYp2Lx1QcNWp7xytGjUQzPs2LY,3255
 arcade_core/version.py,sha256=CpXi3jGlx23RvRyU7iytOMZrnspdWw4yofS8lpP1AJU,18
 arcade_core/converters/openai.py,sha256=4efdgTkvdwT44VGStBhdUmzCnoP5dysceIqPVVPG-vk,7408
@@ -23,6 +23,6 @@ arcade_core/usage/constants.py,sha256=1FQIhkFFMZUhU-H4A7GvMb7KQ3qLFrNAZb2-LEvSF3
 arcade_core/usage/identity.py,sha256=2dP1iusI9pE_GrPlz3VXEdz51R5JlNo9_-OXbe6vn7I,6716
 arcade_core/usage/usage_service.py,sha256=xzWWSEktm58liiNYugBHRactSru8V5foriHcsoH0j1A,3407
 arcade_core/usage/utils.py,sha256=FqBOmlhwT68cbnpI5Vx9ZW6vLRYPVg4FJ0GaMEp8qEM,398
-arcade_core-3.2.0.dist-info/METADATA,sha256=Zu1AZLIDxmQmJeuZNHaFdYRpsgbmgZg0i16vFtD_Poc,2383
-arcade_core-3.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-arcade_core-3.2.0.dist-info/RECORD,,
+arcade_core-3.3.1.dist-info/METADATA,sha256=4-Lc2GDL-C3cq4zM2l1bUIoZH7D8HZ-WCWQJn2GC9Mw,2383
+arcade_core-3.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+arcade_core-3.3.1.dist-info/RECORD,,