mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-21 05:45:37 +08:00
Adopt #23067's store infrastructure wholesale where it is canonical, keeping only genuine lazy-toolbox additions as deltas on top: - Store package: adopt #23067's factory.py/interface.py split and facade __init__.py, and its URL-only SqlAlchemyToolSourceStore. Re-apply lazy-only deltas — ToolIndexEntry panel-contract fields (icon/xrefs/model_class/ form_style/is_workflow_compatible/source_path) and data_manager_id; composite per-version index merge; scored multi-store whoosh search (search_scored + tool_tags field); populator panel-contract derivation via expand_ontology_data + biotools and data_manager_id stamping; data-manager / converter discovery in discover.py; benchmarks.py. - Config: replace tool_source_store + tool_source_disk_path with the single SQLAlchemy URI tool_source_database_connection (defaulted in config/__init__.py, validated via try_parsing, schema attr added), adopt #23067's tool_source_stores wording, and keep the branch-only use_lazy_toolbox / lazy_toolbox_cache_size options. Regenerated galaxy.yml.sample, galaxy_options.rst, and the schema-type stub. galaxy_mock uses tool_source_database_connection. - Docs: adopt #23067's tool_source_storage.rst (admin + dev) as the base and re-add the lazy sections (LazyToolBox, batch-endpoint integration, materialisation-count guard, LazyToolboxSearch multi-store search, benchmarks). - Tests: adopt #23067's store + scripts unit tests; re-add the ours-only composite entries_by_version merge test, data-manager discovery / build-index tests, and multi-store search test, all on the URI config. Claude-Session: https://claude.ai/code/session_018L7ZmCv2ubKA3JNeSL8Pkr
308 lines
14 KiB
ReStructuredText
308 lines
14 KiB
ReStructuredText
Tool Source Storage Architecture
|
|
================================
|
|
|
|
This document describes the architecture of the tool source storage subsystem
|
|
and the LazyToolBox. For operator-facing setup and configuration, see
|
|
:doc:`/admin/tool_source_storage`.
|
|
|
|
Goals
|
|
-----
|
|
|
|
The traditional ``ToolBox`` parses every tool XML at startup, builds full
|
|
``Tool`` objects, and keeps them all in memory. With thousands of tools that
|
|
scales poorly: slow boot, large per-process RSS, and expensive worker reloads.
|
|
|
|
The tool source storage subsystem moves that work out of the request path:
|
|
|
|
- A separate process (``populate_store.py``) parses tools once and persists
|
|
the canonical, macro-expanded source plus a lightweight metadata index.
|
|
- Galaxy processes load only the index at startup and materialize ``Tool``
|
|
objects on demand, with LRU eviction.
|
|
- Batch endpoints (``/api/tools``, ``/api/tools/tests_summary``,
|
|
``/api/tool_panels`` …) answer from the index instead of iterating the
|
|
full toolbox.
|
|
|
|
Module Layout
|
|
-------------
|
|
|
|
::
|
|
|
|
lib/galaxy/tools/source_store/
|
|
__init__.py Facade re-exporting the interface + factory
|
|
interface.py ToolSourceStore ABC, StoredToolSource, exceptions
|
|
factory.py build_tool_source_store() / build_named_store()
|
|
sqlalchemy.py SqlAlchemyToolSourceStore (any SQLAlchemy URL)
|
|
composite.py CompositeToolSourceStore (per-conf routing, merged index)
|
|
index.py ToolIndex, ToolIndexEntry (the lightweight metadata)
|
|
search.py ToolWhooshIndex (Whoosh index built from a ToolIndex)
|
|
discover.py discover_tools() — conf walk without booting a ToolBox
|
|
populator.py Population + watch logic (parse, store, index, broadcast)
|
|
models.py Pydantic models for stored payloads
|
|
benchmarks.py Store/index micro-benchmarks
|
|
|
|
lib/galaxy/tools/lazy_toolbox.py LazyToolBox (subclass of ToolBox), LazyTool
|
|
lib/galaxy/tools/search/__init__.py LazyToolboxSearch (queries every store's index)
|
|
lib/galaxy/tool_util/id_util.py Cheap tool-ID extraction (regex, no XML parser)
|
|
|
|
lib/galaxy/webapps/galaxy/services/tools.py Batch endpoints (lazy-aware)
|
|
|
|
scripts/tool_source/populate_store.py CLI entry point for the populator
|
|
|
|
Data Model
|
|
----------
|
|
|
|
Two persistence concepts:
|
|
|
|
**StoredToolSource** — the canonical macro-expanded XML/YAML for a tool,
|
|
keyed by SHA-256 of the expanded content. Multiple versions of the same
|
|
``tool_id`` coexist as separate hashes. The store keeps its own schema in a
|
|
standalone database (a SQLite file by default, any SQLAlchemy URL for shared
|
|
deployments) — deliberately outside Galaxy's database: the store is a
|
|
rebuildable cache and does not participate in Galaxy's migrations or session
|
|
lifecycle.
|
|
|
|
**ToolIndex** — a single dataclass containing one ``ToolIndexEntry`` per tool,
|
|
holding everything the batch APIs and the lazy panel render need (id, name,
|
|
description, panel section, labels, EDAM, xrefs, icon, requirements, container
|
|
info, test counts, hidden/disabled, shed metadata, ``data_manager_id``). The
|
|
index is serialized and gzip-compressed as a blob.
|
|
|
|
The schema is auto-created on first open; ``tool_index`` holds a single
|
|
row per index version.
|
|
|
|
Backend Abstraction
|
|
-------------------
|
|
|
|
``ToolSourceStore`` (in ``tools/source_store/interface.py``) is an ABC defining:
|
|
|
|
- ``store/get/exists/delete/list_all/get_by_tool_id/count`` — per-tool source
|
|
operations, all keyed by content hash.
|
|
- ``store_index/load_index/update_index_entry`` — index operations.
|
|
- ``get_stats()`` — backend-specific stats (count, size, backend name).
|
|
|
|
``build_tool_source_store(config)`` is the only entry point used
|
|
by Galaxy. It builds the default store from
|
|
``config.tool_source_database_connection`` and uses the same SQLAlchemy-backed
|
|
store implementation for all configured URIs. The store is only built when
|
|
``use_lazy_toolbox`` is enabled — default deployments never initialize it.
|
|
``ConfigurationError`` is raised for missing required settings and is allowed
|
|
to propagate up so misconfiguration fails fast at startup.
|
|
|
|
The ABC defines a ``read_only: bool`` class attribute (default ``False``).
|
|
``ReadOnlyStoreError`` is raised by mutating methods of stores that opted
|
|
in. The populator, watch reload, and composite all consult this flag to
|
|
route around read-only members rather than crashing.
|
|
|
|
Per-conf composition
|
|
^^^^^^^^^^^^^^^^^^^^
|
|
|
|
If any tool_conf carries a top-level ``store="..."`` attribute (XML root)
|
|
or ``store: ...`` key (YAML), ``build_tool_source_store`` instantiates
|
|
the referenced named stores from ``config.tool_source_stores`` and wraps
|
|
them with the writable default in a :class:`CompositeToolSourceStore`.
|
|
|
|
The composite implements the same ``ToolSourceStore`` interface, so the
|
|
LazyToolBox, services, and queue worker stay completely unaware of the
|
|
multi-store layout:
|
|
|
|
- **Reads** iterate ``[per-conf members..., default]`` in order; first
|
|
hit wins. ``count`` and ``list_all`` dedupe across members.
|
|
- **Writes** always land on the designated default. The default may not
|
|
itself be ``read_only``; that's enforced at construction.
|
|
- ``load_index()`` calls each member's ``load_index()`` and folds the
|
|
entries into a single :class:`ToolIndex`. Earlier members shadow later
|
|
ones on tool-id collisions; ``by_section`` is unioned; ``built_at``
|
|
takes the most recent value.
|
|
- ``invalidate_index_cache()`` fans out so a single Kombu reload hits
|
|
every member.
|
|
- ``store_to(name, ...)`` lets the populator address a specific member by
|
|
name without going through composite write routing.
|
|
|
|
When no tool_conf opts in, ``build_tool_source_store`` returns the
|
|
default store directly — the composite path is zero-cost for the common
|
|
case.
|
|
|
|
The ``sqlalchemy`` backend (``sqlalchemy.py``) was added to make this
|
|
useful for CVMFS: a single self-contained ``.sqlite`` file, opened with
|
|
its own SQLAlchemy ``MetaData`` (independent of ``galaxy.model``) so the
|
|
file is portable, and openable with a SQLite URI such as
|
|
``sqlite:///file:/cvmfs/example.org/tools/sources.sqlite?mode=ro&uri=true``
|
|
for read-only mounts. Despite the name, the backend is not sqlite-specific -
|
|
pass any SQLAlchemy URL (Postgres, MySQL, ...). Auto schema creation runs on
|
|
first open; on remote backends operators may prefer to manage migrations
|
|
explicitly.
|
|
|
|
Per-conf populator routing
|
|
^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
|
|
``scripts/tool_source/populate_store.py`` is per-conf aware. It reads
|
|
``parse_store_name()`` for each tool_conf, builds every named store plus
|
|
the default, and routes each ``DiscoveredTool.path`` to the store its
|
|
conf points at. By default it populates *every* writable store in one
|
|
run; ``--target NAME`` restricts to a single store and raises
|
|
``ReadOnlyStoreError`` if that store is read-only. Tools whose target is
|
|
read-only in default mode are silently skipped (the bundle is treated as
|
|
authoritative for those entries).
|
|
|
|
LazyToolBox
|
|
-----------
|
|
|
|
``LazyToolBox`` extends ``ToolBox`` rather than reimplementing it, so the rest
|
|
of Galaxy can keep using the same ``trans.app.toolbox`` interface. The key
|
|
override is ``_init_tools_from_configs``:
|
|
|
|
1. It loads the persistent ``ToolIndex`` from the store. If the index does
|
|
not cover every tool the configs reference (fresh checkout, new conf
|
|
entry, wiped store), the populator runs in-process to fill the gap —
|
|
it is content-addressed and idempotent, so re-runs on a warm store only
|
|
touch new rows.
|
|
2. It then delegates to the eager conf walk. Every ``<tool>`` the walk
|
|
loads lands in ``create_tool``, where indexed sources short-circuit to a
|
|
``LazyTool`` stub instead of parsing; the panel, ``_tools_by_id``, and
|
|
lineage bookkeeping are all built by the unmodified upstream pipeline
|
|
operating on stubs.
|
|
|
|
Full ``Tool`` objects are built on demand and kept in an ``LRUCache`` of
|
|
``lazy_toolbox_cache_size`` entries (default 500). Cache hits and misses are
|
|
guarded by an ``RLock`` for thread safety.
|
|
|
|
Opting in is explicit: only ``use_lazy_toolbox: true`` activates the lazy
|
|
toolbox. A populated store on its own (e.g. brought in by a per-conf
|
|
``store="..."`` attribute) does not flip a default deployment to lazy mode.
|
|
|
|
Tool ID extraction
|
|
^^^^^^^^^^^^^^^^^^
|
|
|
|
``galaxy.tool_util.id_util`` provides ``extract_tool_id_from_xml`` and
|
|
``extract_tool_id_from_file``: regex-based ID lookup that reads only the
|
|
first ~2 KB of the XML. This avoids paying for full XML parsing during
|
|
panel-structure discovery, where we just need the ID to map a file entry
|
|
back to an index entry.
|
|
|
|
Discovery
|
|
---------
|
|
|
|
``galaxy.tools.source_store.discover.discover_tools`` walks tool config files
|
|
and yields ``DiscoveredTool`` records without booting a full ``ToolBox``. It is
|
|
used by:
|
|
|
|
- the populator to find tools to parse and store.
|
|
- watch mode to know which directories to monitor.
|
|
- callers that compare on-disk confs against the indexed tool set.
|
|
- (indirectly) the LazyToolBox panel-structure code path.
|
|
|
|
It also walks ``data_manager_conf``/``shed_data_manager_conf`` and the
|
|
datatype converters so data-manager and converter tools — loaded post-boot
|
|
outside any tool_conf — still land in the index.
|
|
|
|
Pulling discovery out of ``ToolBox`` was deliberate: the populator must run
|
|
*without* a full app (or even a running Galaxy), and the watch mode must run in
|
|
a long-lived loop with no Galaxy process at all.
|
|
|
|
Population Script
|
|
-----------------
|
|
|
|
``scripts/tool_source/populate_store.py`` is a thin CLI wrapper over
|
|
``galaxy.tools.source_store.populator.main``. It loads only the Galaxy
|
|
config and calls ``build_tool_source_store(config)`` — the standalone store
|
|
needs no datatypes registry or Galaxy model. Tools are parsed in a
|
|
``ThreadPoolExecutor`` (``--parallel``, default 4 workers); each tool is
|
|
hashed and skipped if an entry with the same hash already exists
|
|
(``--incremental``, the default). Once the JSON index is committed the
|
|
populator rebuilds the Whoosh search index (``search.py``) so ranked tool
|
|
search stays in sync with the stored sources.
|
|
|
|
Watch mode (``--watch``) uses ``watchdog`` to monitor every directory yielded
|
|
by ``discover_tools``. File events are debounced (default 2 s), the changed
|
|
files are re-parsed, the store is updated, and a single
|
|
``reload_tool_source_cache`` Kombu control task is published on the Galaxy
|
|
exchange. ``--watch-polling`` switches to ``PollingObserver`` for
|
|
NFS/CVMFS/network filesystems where inotify is unreliable.
|
|
|
|
The control task handler lives in ``galaxy.queue_worker.reload_tool_source_cache``
|
|
and is wired into the ``control_message_to_task`` map. Each Galaxy process
|
|
that receives the message:
|
|
|
|
1. Calls ``LazyToolBox.invalidate_index_cache()`` (drops the in-memory
|
|
index reference so the next access reloads from the store).
|
|
2. Calls ``ToolSourceStore.invalidate_index_cache()`` on the store itself.
|
|
|
|
Note that the LRU cache of fully constructed ``Tool`` objects is not
|
|
flushed by reload — only the index is invalidated. Stale ``Tool`` instances
|
|
are evicted naturally as new ones are loaded.
|
|
|
|
Batch Endpoint Integration
|
|
--------------------------
|
|
|
|
``ToolsService`` (``services/tools.py``) serves the batch endpoints without
|
|
materialising tools:
|
|
|
|
- ``list_tools`` (flat and panel) goes through ``AbstractToolBox.to_dict``
|
|
in both modes — the per-user ``FilterFactory`` pass runs as in eager mode,
|
|
and ``get_tool_to_dict`` serves ``LazyTool`` stubs from their index
|
|
entries.
|
|
- ``search_tools`` queries the ``app.toolbox_search`` singleton
|
|
(``LazyToolboxSearch`` in lazy mode); hits are resolved against registered
|
|
stubs via ``LazyToolBox.resolve_search_hit`` with a per-hit access check.
|
|
- ``get_tests_summary`` and ``get_all_requirements`` answer from
|
|
``ToolIndex`` entries when the toolbox is lazy, and iterate the toolbox
|
|
otherwise.
|
|
|
|
The integration suite pins this: ``_lazy_materialize_count`` (bumped in the
|
|
single materialise chokepoint) must not move across any of these endpoints.
|
|
|
|
``LazyToolboxSearch`` (``tools/search/__init__.py``) queries the whoosh index
|
|
of *every* configured store — the default plus each named per-conf store —
|
|
via ``ToolWhooshIndex.search_scored``, then merges the per-store hit lists by
|
|
BM25 score. A tool served from a named store is therefore reachable through
|
|
``/api/tools?q=`` even though its source lives outside the default store.
|
|
|
|
App Wiring
|
|
----------
|
|
|
|
``galaxy.app.UniverseApplication.__init__`` calls
|
|
``_init_tool_source_store`` early and registers the result as a singleton
|
|
under ``ToolSourceStore``. The toolbox is then chosen based on
|
|
``use_lazy_toolbox``. The store is exposed as ``app.tool_source_store`` and is
|
|
``Optional`` only to satisfy type checkers — in practice the build either
|
|
succeeds or raises ``ConfigurationError``.
|
|
|
|
Design Notes
|
|
------------
|
|
|
|
**Why a separate index instead of always querying the store?** A consumer
|
|
needs O(N) access to N entries; doing that against the backing store on every
|
|
request is a latency hit. Keeping the index in-process and only paying for
|
|
invalidation on reload is the better tradeoff.
|
|
|
|
**Why an out-of-process populator?** Parsing tools and computing macro
|
|
expansions is expensive and shouldn't block worker startup. Keeping the
|
|
populator separate also lets it run on a single host while many web workers
|
|
share the resulting store.
|
|
|
|
**Why subclass ToolBox instead of building a parallel hierarchy?**
|
|
``trans.app.toolbox`` is referenced from hundreds of call sites that expect
|
|
the full ToolBox interface. Subclassing keeps the Liskov-substitution
|
|
property and lets unmodified callers benefit from lazy loading transparently.
|
|
|
|
**Why hash-keyed storage?** Content-addressed storage gives us cheap
|
|
deduplication across versions and shed installations, and idempotent
|
|
incremental updates: re-running the populator over an unchanged tree is
|
|
effectively a no-op.
|
|
|
|
Testing
|
|
-------
|
|
|
|
- Store unit tests: ``test/unit/app/tools/source_store/`` exercises each backend
|
|
through the ``ToolSourceStore`` interface (``test_stores.py``,
|
|
``test_sqlite_store.py``, ``test_composite_store.py``,
|
|
``test_index_versions.py``, ``test_multi_store_search.py``).
|
|
- Populator/discovery unit tests: ``test/unit/scripts/tool_source/``
|
|
(``test_populate_store.py``, ``test_discover.py``,
|
|
``test_build_index_entry.py``, ``test_whoosh_dir.py``). These use fakes
|
|
(not mocks) of ``ToolSourceStore`` so behavior is verified against the real
|
|
interface.
|
|
- Integration tests: ``test/integration/test_tool_source_storage.py`` spins
|
|
up Galaxy against the store and verifies end-to-end behavior.
|
|
- Benchmarks: ``python -m galaxy.tools.source_store.benchmarks --iterations 100``.
|