From 7ecb10f8b4844d0d726468230ee3f1f4296c257c Mon Sep 17 00:00:00 2001 From: Denys SAVCHENKO Date: Thu, 11 Apr 2024 18:26:43 +0200 Subject: [PATCH 1/2] default creativework status --- odabot/cli.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/odabot/cli.py b/odabot/cli.py index 641db5f..98044ee 100755 --- a/odabot/cli.py +++ b/odabot/cli.py @@ -263,7 +263,8 @@ def update_workflow(last_commit, build_engine, cleanup, gitlab_api_url, - extra_emails=[]): + extra_emails=[], + creative_work_status = "development"): deployed_workflows = {} deployment_info = None @@ -404,14 +405,17 @@ def update_workflow(last_commit, else: - sparql_obj.insert(f''' + kg_record = f''' {rdflib.URIRef(project['http_url_to_repo']).n3()} a oda:WorkflowService; - oda:last_activity_timestamp "{last_commit_created_at}"; - oda:last_deployed_timestamp "{datetime.now().timestamp()}"; - oda:service_name "{project['name'].lower().replace(' ', '_').replace('-', '_')}"; - oda:deployment_namespace "{deployment_namespace}"; - oda:deployment_name "{deployment_info['deployment_name']}" . - ''') + oda:last_activity_timestamp "{last_commit_created_at}"; + oda:last_deployed_timestamp "{datetime.now().timestamp()}"; + oda:service_name "{project['name'].lower().replace(' ', '_').replace('-', '_')}"; + oda:deployment_namespace "{deployment_namespace}"; + oda:deployment_name "{deployment_info['deployment_name']}"; + "{creative_work_status}". + ''' + + sparql_obj.insert() set_commit_state(gitlab_api_url, project['id'], last_commit['id'], @@ -460,6 +464,8 @@ def update_workflows(obj, dry_run, force, loop, pattern): gitlab_api_url = obj['settings'].get('gitlab.api_url', "https://gitlab.renkulab.io/api/v4/") gitlab_gid = obj['settings'].get('gitlab.gid', 5606) + default_creative_status = obj['settings'].get('nb2workflow.default_creative_status', 'development') + if obj['settings'].get('nb2workflow.state_storage.type', 'yaml') == 'yaml': state_storage = obj['settings'].get('nb2workflow.state_storage.path', 'oda-bot-runtime-workflows.yaml') else: @@ -519,7 +525,8 @@ def update_workflows(obj, dry_run, force, loop, pattern): build_engine, cleanup=False if obj['debug'] else True, gitlab_api_url=gitlab_api_url, - extra_emails=admin_emails) + extra_emails=admin_emails, + creative_work_status=default_creative_status) logger.info('Workflow update status %s', workflow_update_status) logger.info('Deployment info %s', deployment_info) From 83384e88f46c34e690edf33a20036f0b7cf83ffe Mon Sep 17 00:00:00 2001 From: Denys SAVCHENKO Date: Thu, 11 Apr 2024 18:40:50 +0200 Subject: [PATCH 2/2] fix --- odabot/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odabot/cli.py b/odabot/cli.py index 98044ee..c23cd90 100755 --- a/odabot/cli.py +++ b/odabot/cli.py @@ -415,7 +415,7 @@ def update_workflow(last_commit, "{creative_work_status}". ''' - sparql_obj.insert() + sparql_obj.insert(kg_record) set_commit_state(gitlab_api_url, project['id'], last_commit['id'],