mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-30 18:13:23 +08:00
Merge branch 'release_26.0' into dev
This commit is contained in:
@@ -9999,6 +9999,9 @@ class WorkflowInvocation(Base, UsesCreateAndUpdateTime, Dictifiable, Serializabl
|
||||
for content in self.input_dataset_collections:
|
||||
if content.workflow_step_id == step_id:
|
||||
return True
|
||||
for content in self.input_step_parameters:
|
||||
if content.workflow_step_id == step_id:
|
||||
return True
|
||||
return False
|
||||
|
||||
def set_handler(self, handler: str) -> None:
|
||||
|
||||
@@ -250,9 +250,6 @@ class ChatAPI:
|
||||
user: User = DependsOnUser,
|
||||
) -> list[dict[str, Any]]:
|
||||
"""Get user's chat history."""
|
||||
if not user:
|
||||
return []
|
||||
|
||||
exchanges = self.chat_manager.get_user_chat_history(trans, limit=limit, include_job_chats=False)
|
||||
|
||||
# Format exchanges for frontend
|
||||
@@ -293,9 +290,6 @@ class ChatAPI:
|
||||
user: User = DependsOnUser,
|
||||
) -> dict[str, str]:
|
||||
"""Clear user's chat history (non-job chats only)."""
|
||||
if not user:
|
||||
return {"message": "No user logged in"}
|
||||
|
||||
try:
|
||||
# Get all non-job chat exchanges for user
|
||||
exchanges = self.chat_manager.get_user_chat_history(trans, limit=1000, include_job_chats=False)
|
||||
@@ -329,8 +323,6 @@ class ChatAPI:
|
||||
user: User = DependsOnUser,
|
||||
) -> dict[str, str]:
|
||||
"""Delete a single chat exchange."""
|
||||
if not user:
|
||||
return {"message": "No user logged in"}
|
||||
self.chat_manager.delete_exchange(trans, exchange_id)
|
||||
return {"message": "Deleted"}
|
||||
|
||||
@@ -342,8 +334,6 @@ class ChatAPI:
|
||||
user: User = DependsOnUser,
|
||||
) -> dict[str, str]:
|
||||
"""Delete multiple chat exchanges."""
|
||||
if not user:
|
||||
return {"message": "No user logged in"}
|
||||
count = self.chat_manager.delete_exchanges(trans, payload.ids)
|
||||
return {"message": f"Deleted {count} exchanges"}
|
||||
|
||||
|
||||
@@ -640,7 +640,7 @@ class WorkflowProgress:
|
||||
if not invocation.has_input_for_step(step.id):
|
||||
content = outputs.get("output", NO_REPLACEMENT)
|
||||
if content is not NO_REPLACEMENT:
|
||||
log.info("ADDING INPUT FOR STEP %s: %s", step.id, content, exc_info=True)
|
||||
log.debug("Adding input for step %s: %s", step.id, content)
|
||||
invocation.add_input(content, step.id)
|
||||
self.set_step_outputs(invocation_step, outputs, already_persisted=already_persisted)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user