Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lib/galaxy/jobs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1048,8 +1048,6 @@ def __init__(
self._job_io = None
self.tool_provided_job_metadata = None
self.params = None
if job.params:
self.params = loads(job.params)
self.runner_command_line = None

# Wrapper holding the info required to restore and clean up from files used for setting metadata externally
Expand Down
5 changes: 2 additions & 3 deletions lib/galaxy/jobs/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,10 @@ def enqueue(self, job, tool=None, flush=True):
configured_handler = None
if tool:
tool_id = tool.id
configured_handler = tool.get_configured_job_handler(job.params)
configured_handler = tool.get_configured_job_handler()
if configured_handler is not None:
p = f" (with job params: {str(job.params)})" if job.params else ""
log.debug(
"(%s) Configured job handler for tool '%s'%s is: %s", job.log_str(), tool_id, p, configured_handler
"(%s) Configured job handler for tool '%s' is: %s", job.log_str(), tool_id, configured_handler
)
queue_callback = partial(self._queue_callback, job, tool_id)
message_callback = partial(self._message_callback, job)
Expand Down
2 changes: 0 additions & 2 deletions lib/galaxy/jobs/runners/state_handlers/resubmit.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ def _handle_resubmit_definitions(resubmit_definitions, app, job_runner, job_stat
# Clear external ID (state change below flushes the change)
job.job_runner_external_id = None
# Allow the UI to query for resubmitted state
if job.params is None:
job.params = {}
job_state.runner_state_handled = True
info = f"This job was resubmitted to the queue because {MESSAGES[runner_state]} on its compute resource."
job_runner.mark_as_resubmitted(job_state, info=info)
Expand Down
7 changes: 0 additions & 7 deletions lib/galaxy/model/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1584,7 +1584,6 @@ class Job(Base, JobLike, UsesCreateAndUpdateTime, Dictifiable, Serializable):
destination_params: Mapped[Optional[bytes]] = mapped_column(MutableJSONType)
object_store_id: Mapped[Optional[str]] = mapped_column(TrimmedString(255), index=True)
imported: Mapped[Optional[bool]] = mapped_column(default=False, index=True)
params: Mapped[Optional[str]] = mapped_column(TrimmedString(255), index=True)
handler: Mapped[Optional[str]] = mapped_column(TrimmedString(255), index=True)
preferred_object_store_id: Mapped[Optional[str]] = mapped_column(String(255))
object_store_id_overrides: Mapped[Optional[dict[str, Optional[str]]]] = mapped_column(JSONType)
Expand Down Expand Up @@ -1849,9 +1848,6 @@ def get_imported(self):
def get_handler(self):
return self.handler

def get_params(self):
return self.params

def get_user(self):
# This is defined in the SQL Alchemy mapper as a relation to the User.
return self.user
Expand Down Expand Up @@ -1938,9 +1934,6 @@ def set_imported(self, imported):
def set_handler(self, handler):
self.handler = handler

def set_params(self, params):
self.params = params

def add_parameter(self, name, value):
self.parameters.append(JobParameter(name, value))

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
"""Drop Job.params column

Revision ID: a5c5455b849a
Revises: e382f8eb5e12
Create Date: 2025-10-15 16:13:14.778789

"""

from sqlalchemy import Column

from galaxy.model.custom_types import TrimmedString
from galaxy.model.migrations.util import (
add_column,
drop_column,
)

# revision identifiers, used by Alembic.
revision = "a5c5455b849a"
down_revision = "e382f8eb5e12"
branch_labels = None
depends_on = None

table_name = "job"
column_name = "params"


def upgrade():
drop_column(table_name, column_name)


def downgrade():
add_column(table_name, Column(column_name, TrimmedString(255)))
9 changes: 3 additions & 6 deletions lib/galaxy/tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1244,18 +1244,15 @@ def __get_job_tool_configuration(self, job_params=None):
), f"Could not get a job tool configuration for Tool {self.id} with job_params {job_params}, this is a bug"
return rval

def get_configured_job_handler(self, job_params=None):
"""Get the configured job handler for this `Tool` given the provided `job_params`.
def get_configured_job_handler(self):
"""Get the configured job handler for this `Tool`.

Unlike the former ``get_job_handler()`` method, this does not perform "preassignment" (random selection of
a configured handler ID from a tag).

:param job_params: Any params specific to this job (e.g. the job source)
:type job_params: dict or None

:returns: str or None -- The configured handler for a job run of this `Tool`
"""
return self.__get_job_tool_configuration(job_params=job_params).handler
return self.__get_job_tool_configuration().handler

def get_job_destination(self, job_params=None):
"""
Expand Down
3 changes: 0 additions & 3 deletions lib/galaxy/tools/actions/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
Mapping,
MutableMapping,
)
from json import dumps
from typing import (
Any,
cast,
Expand Down Expand Up @@ -738,8 +737,6 @@ def handle_output(name, output, hidden=None):
# execute immediate post job actions and associate post job actions that are to be executed after the job is complete
if job_callback:
job_callback(job)
if job_params:
job.params = dumps(job_params)
if completed_job:
job.set_copied_from_job_id(completed_job.id)
trans.sa_session.add(job)
Expand Down
3 changes: 0 additions & 3 deletions lib/galaxy/tools/actions/metadata.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import logging
import os
from json import dumps
from typing import (
Any,
Optional,
Expand Down Expand Up @@ -144,8 +143,6 @@ def execute_via_app(
job.tool_id = tool.id
if user:
job.user_id = user.id
if job_params:
job.params = dumps(job_params)
start_job_state = job.state # should be job.states.NEW
try:
# For backward compatibility, some tools may not have versions yet.
Expand Down
Loading