arcade-core 3.3.0__tar.gz → 3.3.2__tar.gz

{arcade_core-3.3.0 → arcade_core-3.3.2}/PKG-INFO

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

{arcade_core-3.3.0 → arcade_core-3.3.2}/arcade_core/catalog.py

@@ -203,9 +203,18 @@ class ToolCatalog(BaseModel):
         tool_func: Callable,
         toolkit_or_name: str | Toolkit,
         module: ModuleType | None = None,
+        toolkit_version: str | None = None,
+        toolkit_description: str | None = None,
     ) -> None:
         """
         Add a function to the catalog as a tool.
+
+        Args:
+            tool_func: The function to add to the catalog.
+            toolkit_or_name: The toolkit or name of the toolkit.
+            module: The module to add the tool from.
+            toolkit_version: The version of the toolkit. Overrides the version of the toolkit if provided.
+            toolkit_description: The description of the toolkit. Overrides the description of the toolkit if provided.
         """
 
         input_model, output_model = create_func_models(tool_func)
@@ -213,6 +222,8 @@ class ToolCatalog(BaseModel):
         if isinstance(toolkit_or_name, Toolkit):
             toolkit = toolkit_or_name
             toolkit_name = toolkit.name
+            toolkit_version = toolkit_version or toolkit.version
+            toolkit_description = toolkit_description or toolkit.description
         elif isinstance(toolkit_or_name, str):
             toolkit = None
             toolkit_name = toolkit_or_name
@@ -223,8 +234,8 @@ class ToolCatalog(BaseModel):
         definition = ToolCatalog.create_tool_definition(
             tool_func,
             toolkit_name,
-            toolkit.version if toolkit else None,
-            toolkit.description if toolkit else None,
+            toolkit_version,
+            toolkit_description,
         )
 
         fully_qualified_name = definition.get_fully_qualified_name()
@@ -283,7 +294,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-3.3.0 → arcade_core-3.3.2}/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.3.0 → arcade_core-3.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arcade-core"
-version = "3.3.0"
+version = "3.3.2"
 description = "Arcade Core - Core library for Arcade platform"
 readme = "README.md"
 license = {text = "MIT"}