From bcf82eb1ed7fef6f8842784342200a2642d3e66d Mon Sep 17 00:00:00 2001 From: Wen Guan Date: Fri, 6 Sep 2024 13:42:59 +0200 Subject: [PATCH 1/3] revert the return values --- client/lib/idds/client/clientmanager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/lib/idds/client/clientmanager.py b/client/lib/idds/client/clientmanager.py index f5e344b8..38ff0a3f 100644 --- a/client/lib/idds/client/clientmanager.py +++ b/client/lib/idds/client/clientmanager.py @@ -872,7 +872,7 @@ def get_collections(self, request_id=None, transform_id=None, workload_id=None, colls = self.client.get_collections(request_id=request_id, transform_id=transform_id, workload_id=workload_id, scope=scope, name=name, relation_type=relation_type) - return True, colls + return colls def get_contents(self, request_id=None, transform_id=None, workload_id=None, coll_scope=None, coll_name=None, relation_type=None, status=None): """ @@ -892,7 +892,7 @@ def get_contents(self, request_id=None, transform_id=None, workload_id=None, col contents = self.client.get_contents(request_id=request_id, transform_id=transform_id, workload_id=workload_id, coll_scope=coll_scope, coll_name=coll_name, relation_type=relation_type, status=status) - return True, contents + return contents @exception_handler def get_contents_output_ext(self, request_id=None, workload_id=None, transform_id=None, group_by_jedi_task_id=False): @@ -909,7 +909,7 @@ def get_contents_output_ext(self, request_id=None, workload_id=None, transform_i contents = self.client.get_contents_output_ext(workload_id=workload_id, request_id=request_id, transform_id=transform_id, group_by_jedi_task_id=group_by_jedi_task_id) - return True, contents + return contents @exception_handler def update_build_request(self, request_id, signature, workflow): @@ -925,7 +925,7 @@ def update_build_request(self, request_id, signature, workflow): self.setup_client() ret = self.client.update_build_request(request_id=request_id, signature=signature, workflow=workflow) - return True, ret + return ret @exception_handler def get_metainfo(self, name): From 54988b207b6f81252135a8e6395d27ec5f730278 Mon Sep 17 00:00:00 2001 From: Wen Guan Date: Fri, 6 Sep 2024 13:43:50 +0200 Subject: [PATCH 2/3] option to enable separate logs --- workflow/lib/idds/iworkflow/workflow.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/lib/idds/iworkflow/workflow.py b/workflow/lib/idds/iworkflow/workflow.py index 376b77f2..f21bbf0e 100644 --- a/workflow/lib/idds/iworkflow/workflow.py +++ b/workflow/lib/idds/iworkflow/workflow.py @@ -1261,12 +1261,12 @@ def get_func_name(self): # foo = workflow(arg)(foo) def workflow(func=None, *, local=False, service='idds', source_dir=None, primary=False, queue=None, site=None, cloud=None, max_walltime=24 * 3600, distributed=True, init_env=None, pre_kwargs={}, return_workflow=False, no_wraps=False, - source_dir_parent_level=None, exclude_source_files=[], clean_env=None): + source_dir_parent_level=None, exclude_source_files=[], enable_separate_log=False, clean_env=None): if func is None: return functools.partial(workflow, local=local, service=service, source_dir=source_dir, primary=primary, queue=queue, site=site, cloud=cloud, max_walltime=max_walltime, distributed=distributed, init_env=init_env, pre_kwargs=pre_kwargs, no_wraps=no_wraps, return_workflow=return_workflow, source_dir_parent_level=source_dir_parent_level, - exclude_source_files=exclude_source_files, clean_env=clean_env) + exclude_source_files=exclude_source_files, clean_env=clean_env, enable_separate_log=enable_separate_log) if 'IDDS_IGNORE_WORKFLOW_DECORATOR' in os.environ: return func @@ -1276,7 +1276,7 @@ def wrapper(*args, **kwargs): try: f = Workflow(func, service=service, source_dir=source_dir, local=local, max_walltime=max_walltime, distributed=distributed, pre_kwargs=pre_kwargs, args=args, kwargs=kwargs, init_env=init_env, source_dir_parent_level=source_dir_parent_level, - exclude_source_files=exclude_source_files, clean_env=clean_env) + exclude_source_files=exclude_source_files, clean_env=clean_env, enable_separate_log=enable_separate_log) f.queue = queue f.site = site From fafcf0a406938a6fd0166aa0fd0304217be8ceb6 Mon Sep 17 00:00:00 2001 From: Wen Guan Date: Fri, 6 Sep 2024 13:44:51 +0200 Subject: [PATCH 3/3] remove old dependency packages --- atlas/tools/env/environment.yml | 3 +-- doma/tools/env/environment.yml | 3 +-- environment.yml | 1 - main/tools/env/environment.yml | 3 +-- requirements.yaml | 1 - tools/environment.yml | 1 - 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/atlas/tools/env/environment.yml b/atlas/tools/env/environment.yml index c5288409..62150353 100644 --- a/atlas/tools/env/environment.yml +++ b/atlas/tools/env/environment.yml @@ -3,7 +3,6 @@ dependencies: - python==3.6 - pip - pip: - - futures # multiple process/threads - unittest2 # unit test tool - pep8 # checks for PEP8 code style compliance - flake8 # Wrapper around PyFlakes&pep8 @@ -14,4 +13,4 @@ dependencies: - rucio-clients - rucio-clients-atlas - idds-common==2.1.30 - - idds-workflow==2.1.30 \ No newline at end of file + - idds-workflow==2.1.30 diff --git a/doma/tools/env/environment.yml b/doma/tools/env/environment.yml index 0a59b767..1f6ca562 100644 --- a/doma/tools/env/environment.yml +++ b/doma/tools/env/environment.yml @@ -3,7 +3,6 @@ dependencies: - python==3.6 - pip - pip: - - futures # multiple process/threads - panda-client-light # panda client - idds-common==2.1.30 - - idds-workflow==2.1.30 \ No newline at end of file + - idds-workflow==2.1.30 diff --git a/environment.yml b/environment.yml index 7a678431..33e36f0e 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,6 @@ dependencies: - retrying # retrying behavior - mysqlclient # mysql python client #- web.py # web service - - futures # multiple process/threads - stomp.py # Messaging broker client - cx-Oracle # Oralce client - unittest2 # unit test tool diff --git a/main/tools/env/environment.yml b/main/tools/env/environment.yml index 3aa948ea..45b3f80e 100644 --- a/main/tools/env/environment.yml +++ b/main/tools/env/environment.yml @@ -11,7 +11,6 @@ dependencies: # - mysqlclient # mysql python client - mod_wsgi # apache wsgi module - flask # web service - - futures # multiple process/threads - stomp.py # Messaging broker client - cx-Oracle # Oralce client - unittest2 # unit test tool @@ -30,4 +29,4 @@ dependencies: - alembic - deepdiff - pyzmq - - oic \ No newline at end of file + - oic diff --git a/requirements.yaml b/requirements.yaml index 0677ef71..51145034 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -11,7 +11,6 @@ dependencies: # - mysqlclient # mysql python client - mod_wsgi # apache wsgi module - flask # web service - - futures # multiple process/threads - stomp.py # Messaging broker client - cx-Oracle # Oralce client - unittest2 # unit test tool diff --git a/tools/environment.yml b/tools/environment.yml index 7a678431..33e36f0e 100644 --- a/tools/environment.yml +++ b/tools/environment.yml @@ -9,7 +9,6 @@ dependencies: - retrying # retrying behavior - mysqlclient # mysql python client #- web.py # web service - - futures # multiple process/threads - stomp.py # Messaging broker client - cx-Oracle # Oralce client - unittest2 # unit test tool