lists.galaxyproject.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
List overview
Download
galaxy-commits
February 2014
----- 2024 -----
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
galaxy-commits@lists.galaxyproject.org
1 participants
192 discussions
Start a n
N
ew thread
commit/galaxy-central: 2 new changesets
by commits-noreply@bitbucket.org
02 Feb '14
02 Feb '14
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/a658be4c5c37/
Changeset: a658be4c5c37 User: jmchilton Date: 2014-02-02 02:49:54 Summary: Search API - allow non-admins to search their own workflows. Just makes sense, but also enables easier functional tests of search. Affected #: 1 file diff -r a629ff293db60b781a9abb29309bc56a2107d366 -r a658be4c5c37165c790ab7bf95801cc230a1a04c lib/galaxy/webapps/galaxy/api/search.py --- a/lib/galaxy/webapps/galaxy/api/search.py +++ b/lib/galaxy/webapps/galaxy/api/search.py @@ -43,7 +43,7 @@ elif type( item ) in [ trans.app.model.Job ]: if item.used_id == trans.user or trans.user_is_admin(): append = True - elif type( item ) in [ trans.app.model.Page ]: + elif type( item ) in [ trans.app.model.Page, trans.app.model.StoredWorkflow ]: try: if self.security_check( trans, item, False, True): append = True
https://bitbucket.org/galaxy/galaxy-central/commits/89d7cf67241f/
Changeset: 89d7cf67241f User: jmchilton Date: 2014-02-02 02:53:04 Summary: Add some intial functional testing of search API. Refactored workflow creation stuff in test_workflows to allow it to be used other places (namely test_search.py). Tests searching for workflows and filtering out deleted workflows. Affected #: 3 files diff -r a658be4c5c37165c790ab7bf95801cc230a1a04c -r 89d7cf67241f36e5f2c4de0aa31328fb7823e7d5 test/functional/api/helpers.py --- a/test/functional/api/helpers.py +++ b/test/functional/api/helpers.py @@ -1,5 +1,9 @@ import time from json import dumps +from json import loads +from pkg_resources import resource_string + +workflow_str = resource_string( __name__, "test_workflow_1.ga" ) class TestsDatasets: @@ -56,3 +60,35 @@ history_id=history_id, **kwds ) + + +class WorkflowPopulator( object ): + # Impulse is to make this a Mixin, but probably better as an object. + + def __init__( self, api_test_case ): + self.api_test_case = api_test_case + + def load_workflow( self, name, add_pja=False ): + workflow = loads( workflow_str ) + workflow[ "name" ] = name + if add_pja: + tool_step = workflow[ "steps" ][ "2" ] + tool_step[ "post_job_actions" ][ "RenameDatasetActionout_file1" ] = dict( + action_type="RenameDatasetAction", + output_name="out_file1", + action_arguments=dict( newname="the_new_name" ), + ) + return workflow + + def simple_workflow( self, name, **create_kwds ): + workflow = self.load_workflow( name ) + return self.create_workflow( workflow, **create_kwds ) + + def create_workflow( self, workflow, **create_kwds ): + data = dict( + workflow=dumps( workflow ), + **create_kwds + ) + upload_response = self.api_test_case._post( "workflows/upload", data=data ) + uploaded_workflow_id = upload_response.json()[ "id" ] + return uploaded_workflow_id diff -r a658be4c5c37165c790ab7bf95801cc230a1a04c -r 89d7cf67241f36e5f2c4de0aa31328fb7823e7d5 test/functional/api/test_search.py --- /dev/null +++ b/test/functional/api/test_search.py @@ -0,0 +1,32 @@ +from base import api +from base.interactor import delete_request + +from .helpers import WorkflowPopulator + + +class SearchApiTestCase( api.ApiTestCase ): + + def test_search_workflows( self ): + workflow_populator = WorkflowPopulator( self ) + workflow_id = workflow_populator.simple_workflow( "test_for_search" ) + search_response = self.__search( "select * from workflow" ) + assert self.__has_result_with_name( search_response, "test_for_search (imported from API)" ), search_response.json() + + # Deleted + delete_url = self._api_url( "workflows/%s" % workflow_id, use_key=True ) + delete_request( delete_url ) + + search_response = self.__search( "select * from workflow where not deleted" ) + assert not self.__has_result_with_name( search_response, "test_for_search (imported from API)" ), search_response.json() + + def __search( self, query ): + data = dict( query=query ) + search_response = self._post( "search", data=data ) + self._assert_status_code_is( search_response, 200 ) + return search_response + + def __has_result_with_name( self, search_response, name ): + search_response_object = search_response.json() + assert "results" in search_response_object, search_response_object + results = search_response_object[ "results" ] + return name in map( lambda r: r.get( "name", None ), results ) diff -r a658be4c5c37165c790ab7bf95801cc230a1a04c -r 89d7cf67241f36e5f2c4de0aa31328fb7823e7d5 test/functional/api/test_workflows.py --- a/test/functional/api/test_workflows.py +++ b/test/functional/api/test_workflows.py @@ -1,14 +1,11 @@ from base import api -from json import loads from json import dumps -from pkg_resources import resource_string import time from .helpers import TestsDatasets +from .helpers import WorkflowPopulator from base.interactor import delete_request # requests like delete -workflow_str = resource_string( __name__, "test_workflow_1.ga" ) - # Workflow API TODO: # - Allow history_id as param to workflow run action. (hist_id) @@ -17,8 +14,12 @@ # - Much more testing obviously, always more testing. class WorkflowsApiTestCase( api.ApiTestCase, TestsDatasets ): + def setUp( self ): + super( WorkflowsApiTestCase, self ).setUp() + self.workflow_populator = WorkflowPopulator( self ) + def test_delete( self ): - workflow_id = self._simple_workflow( "test_delete" ) + workflow_id = self.workflow_populator.simple_workflow( "test_delete" ) workflow_name = "test_delete (imported from API)" self._assert_user_has_workflow_with_name( workflow_name ) workflow_url = self._api_url( "workflows/%s" % workflow_id, use_key=True ) @@ -28,7 +29,7 @@ assert workflow_name not in self.__workflow_names() def test_other_cannot_delete( self ): - workflow_id = self._simple_workflow( "test_other_delete" ) + workflow_id = self.workflow_populator.simple_workflow( "test_other_delete" ) with self._different_user(): workflow_url = self._api_url( "workflows/%s" % workflow_id, use_key=True ) delete_response = delete_request( workflow_url ) @@ -41,14 +42,14 @@ def test_import( self ): data = dict( - workflow=dumps( self._load_workflow( name="test_import" ) ), + workflow=dumps( self.workflow_populator.load_workflow( name="test_import" ) ), ) upload_response = self._post( "workflows/upload", data=data ) self._assert_status_code_is( upload_response, 200 ) self._assert_user_has_workflow_with_name( "test_import (imported from API)" ) def test_export( self ): - uploaded_workflow_id = self._simple_workflow( "test_for_export" ) + uploaded_workflow_id = self.workflow_populator.simple_workflow( "test_for_export" ) download_response = self._get( "workflows/%s/download" % uploaded_workflow_id ) self._assert_status_code_is( download_response, 200 ) downloaded_workflow = download_response.json() @@ -58,7 +59,7 @@ assert first_input[ "name" ] == "WorkflowInput1" def test_run_workflow( self ): - workflow = self._load_workflow( name="test_for_run" ) + workflow = self.workflow_populator.load_workflow( name="test_for_run" ) workflow_request, history_id = self._setup_workflow_run( workflow ) # TODO: This should really be a post to workflows/<workflow_id>/run or # something like that. @@ -67,8 +68,8 @@ self._wait_for_history( history_id, assert_ok=True ) def test_pja_import_export( self ): - workflow = self._load_workflow( name="test_for_pja_import", add_pja=True ) - uploaded_workflow_id = self._create_workflow( workflow ) + workflow = self.workflow_populator.load_workflow( name="test_for_pja_import", add_pja=True ) + uploaded_workflow_id = self.workflow_populator.create_workflow( workflow ) download_response = self._get( "workflows/%s/download" % uploaded_workflow_id ) downloaded_workflow = download_response.json() self._assert_has_keys( downloaded_workflow[ "steps" ], "0", "1", "2" ) @@ -80,7 +81,7 @@ def test_post_job_action( self ): """ Tests both import and execution of post job actions. """ - workflow = self._load_workflow( name="test_for_pja_run", add_pja=True ) + workflow = self.workflow_populator.load_workflow( name="test_for_pja_run", add_pja=True ) workflow_request, history_id = self._setup_workflow_run( workflow ) run_workflow_response = self._post( "workflows", data=workflow_request ) self._assert_status_code_is( run_workflow_response, 200 ) @@ -92,7 +93,7 @@ assert "the_new_name" in map( lambda hda: hda[ "name" ], contents ) def _setup_workflow_run( self, workflow ): - uploaded_workflow_id = self._create_workflow( workflow ) + uploaded_workflow_id = self.workflow_populator.create_workflow( workflow ) workflow_show_resposne = self._get( "workflows/%s" % uploaded_workflow_id ) self._assert_status_code_is( workflow_show_resposne, 200 ) workflow_inputs = workflow_show_resposne.json()[ "inputs" ] @@ -119,20 +120,6 @@ def _ds_entry( self, hda ): return dict( src="hda", id=hda[ "id" ] ) - def _simple_workflow( self, name, **create_kwds ): - workflow = self._load_workflow( name ) - return self._create_workflow( workflow, **create_kwds ) - - def _create_workflow( self, workflow, **create_kwds ): - data = dict( - workflow=dumps( workflow ), - **create_kwds - ) - upload_response = self._post( "workflows/upload", data=data ) - self._assert_status_code_is( upload_response, 200 ) - uploaded_workflow_id = upload_response.json()[ "id" ] - return uploaded_workflow_id - def _assert_user_has_workflow_with_name( self, name ): names = self.__workflow_names() assert name in names, "No workflows with name %s in users workflows <%s>" % ( name, names ) @@ -142,15 +129,3 @@ self._assert_status_code_is( index_response, 200 ) names = map( lambda w: w[ "name" ], index_response.json() ) return names - - def _load_workflow( self, name, add_pja=False ): - workflow = loads( workflow_str ) - workflow[ "name" ] = name - if add_pja: - tool_step = workflow[ "steps" ][ "2" ] - tool_step[ "post_job_actions" ][ "RenameDatasetActionout_file1" ] = dict( - action_type="RenameDatasetAction", - output_name="out_file1", - action_arguments=dict( newname="the_new_name" ), - ) - return workflow Repository URL:
https://bitbucket.org/galaxy/galaxy-central/
-- This is a commit notification from
bitbucket.org
. You are receiving this because you have the service enabled, addressing the recipient of this email.
1
0
0
0
commit/galaxy-central: 3 new changesets
by commits-noreply@bitbucket.org
02 Feb '14
02 Feb '14
3 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/a47f9e36d1d0/
Changeset: a47f9e36d1d0 Branch: search User: Kyle Ellrott Date: 2014-01-31 01:54:44 Summary: Adding deleted field to StoredWorkflow 'to_dict' and ability to use deleted as selection field in search Affected #: 2 files diff -r 985e3d88f9ac85a90de7aa541b5844037cccd120 -r a47f9e36d1d001a2e96ee1043fa7a563cb7e60bd lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -2430,8 +2430,8 @@ class StoredWorkflow( object, Dictifiable): - dict_collection_visible_keys = ( 'id', 'name', 'published' ) - dict_element_visible_keys = ( 'id', 'name', 'published' ) + dict_collection_visible_keys = ( 'id', 'name', 'published', 'deleted' ) + dict_element_visible_keys = ( 'id', 'name', 'published', 'deleted' ) def __init__( self ): self.id = None diff -r 985e3d88f9ac85a90de7aa541b5844037cccd120 -r a47f9e36d1d001a2e96ee1043fa7a563cb7e60bd lib/galaxy/model/search.py --- a/lib/galaxy/model/search.py +++ b/lib/galaxy/model/search.py @@ -407,7 +407,8 @@ FIELDS = { 'name': ViewField('name', sqlalchemy_field=(StoredWorkflow, "name")), 'id': ViewField('id', sqlalchemy_field=(StoredWorkflow, "id"), id_decode=True), - 'tag': ViewField('tag', handler=workflow_tag_handler) + 'tag': ViewField('tag', handler=workflow_tag_handler), + 'deleted': ViewField('deleted', sqlalchemy_field=(StoredWorkflow, "deleted")), } def search(self, trans):
https://bitbucket.org/galaxy/galaxy-central/commits/b5c16a375e42/
Changeset: b5c16a375e42 Branch: search User: Kyle Ellrott Date: 2014-01-31 01:56:57 Summary: Adding ability to select Histories based on 'deleted' status during search Affected #: 1 file diff -r a47f9e36d1d001a2e96ee1043fa7a563cb7e60bd -r b5c16a375e42932c8416b4c235d777b3e4088ad8 lib/galaxy/model/search.py --- a/lib/galaxy/model/search.py +++ b/lib/galaxy/model/search.py @@ -376,7 +376,8 @@ 'name': ViewField('name', sqlalchemy_field=(History, "name")), 'id': ViewField('id', sqlalchemy_field=(History, "id"), id_decode=True), 'tag': ViewField("tag", handler=history_handle_tag), - 'annotation': ViewField("annotation", handler=history_handle_annotation) + 'annotation': ViewField("annotation", handler=history_handle_annotation), + 'deleted': ViewField('deleted', sqlalchemy_field=(History, "deleted")) } def search(self, trans):
https://bitbucket.org/galaxy/galaxy-central/commits/a629ff293db6/
Changeset: a629ff293db6 User: jmchilton Date: 2014-02-02 02:57:47 Summary: Merged in kellrott/galaxy-central/search (pull request #318) Adding deleted field to 'to_dict' and search selection of Workflows Affected #: 2 files diff -r 00810d29c09d351e6e582d4868907b989e686059 -r a629ff293db60b781a9abb29309bc56a2107d366 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -2448,8 +2448,8 @@ class StoredWorkflow( object, Dictifiable): - dict_collection_visible_keys = ( 'id', 'name', 'published' ) - dict_element_visible_keys = ( 'id', 'name', 'published' ) + dict_collection_visible_keys = ( 'id', 'name', 'published', 'deleted' ) + dict_element_visible_keys = ( 'id', 'name', 'published', 'deleted' ) def __init__( self ): self.id = None diff -r 00810d29c09d351e6e582d4868907b989e686059 -r a629ff293db60b781a9abb29309bc56a2107d366 lib/galaxy/model/search.py --- a/lib/galaxy/model/search.py +++ b/lib/galaxy/model/search.py @@ -376,7 +376,8 @@ 'name': ViewField('name', sqlalchemy_field=(History, "name")), 'id': ViewField('id', sqlalchemy_field=(History, "id"), id_decode=True), 'tag': ViewField("tag", handler=history_handle_tag), - 'annotation': ViewField("annotation", handler=history_handle_annotation) + 'annotation': ViewField("annotation", handler=history_handle_annotation), + 'deleted': ViewField('deleted', sqlalchemy_field=(History, "deleted")) } def search(self, trans): @@ -407,7 +408,8 @@ FIELDS = { 'name': ViewField('name', sqlalchemy_field=(StoredWorkflow, "name")), 'id': ViewField('id', sqlalchemy_field=(StoredWorkflow, "id"), id_decode=True), - 'tag': ViewField('tag', handler=workflow_tag_handler) + 'tag': ViewField('tag', handler=workflow_tag_handler), + 'deleted': ViewField('deleted', sqlalchemy_field=(StoredWorkflow, "deleted")), } def search(self, trans): Repository URL:
https://bitbucket.org/galaxy/galaxy-central/
-- This is a commit notification from
bitbucket.org
. You are receiving this because you have the service enabled, addressing the recipient of this email.
1
0
0
0
← Newer
1
...
17
18
19
20
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
Results per page:
10
25
50
100
200