Commit dd5bb92a authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Merge branch 'fix-job-id-bug' into 'main' 

Fix unsafe dict usage

See merge request ndip/public-packages/nova-galaxy!12
parents c43a9a68 e4b18bfe

pyproject.toml

+1 −1
Original line number Diff line number Diff line 
[tool.poetry]

name = "nova-galaxy"

version = "0.6.0"

version = "0.6.1"

description = "Utilties for accessing the ORNL Galaxy instance"

authors = ["Greg Watson <watsongr@ornl.gov>", "Gregory Cage <cagege@ornl.gov>"]

readme = "README.md"

src/nova/galaxy/__init__.py

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ from .nova import Nova, NovaConnection 
from .outputs import Outputs

from .parameters import Parameters

from .tool import Tool

from .util import WorkState



__all__ = [

    "Nova",
@@ -17,6 +18,7 @@ __all__ = [ 
    "Outputs",

    "Parameters",

    "Tool",

    "WorkState",

]



__version__ = importlib.metadata.version("nova-galaxy")

src/nova/galaxy/data_store.py

+8 −7
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ class Datastore: 
        )

        tools = []

        for dataset in history_contents:

            job_id = dataset["creating_job"]

            job_id = dataset.get("creating_job", None)

            if job_id:

                tool_id = self.nova_connection.galaxy_instance.jobs.show_job(job_id)["tool_id"]

                t = Tool(tool_id)

                t.assign_id(job_id, self)