Skip to content

Commit

Permalink
Merge pull request #1245 from Sage-Bionetworks/develop
Browse files Browse the repository at this point in the history
Minor release v23.6.2
  • Loading branch information
linglp authored Jun 23, 2023
2 parents 87a1699 + 39fcc80 commit 81aefdb
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Create and publish a Docker image
on:
push:
tags:
- '*beta*'
- 'v[0-9]+\.[0-9]+\.[0-9]+(?:-[a-zA-Z]+)?'

env:
REGISTRY: ghcr.io
Expand Down
7 changes: 7 additions & 0 deletions schematic_api/api/openapi/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,13 @@ paths:
default: false
description: If True, validation suite will only run with in-house validation rule. If False, the Great Expectations suite will be utilized and all rules will be available.
required: true
- in: query
name: hide_blanks
schema:
type: boolean
description: If true, annotations with blank values will be hidden from a dataset's annotation list in Synaspe. If false, annotations with blank values will be displayed. Default to false
required: false
example: false
- in: query
name: access_token
schema:
Expand Down
3 changes: 2 additions & 1 deletion schematic_api/api/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ def validate_manifest_route(schema_url, data_type, restrict_rules=None, json_str

#####profile validate manifest route function
#@profile(sort_by='cumulative', strip_dirs=True)
def submit_manifest_route(schema_url, asset_view=None, manifest_record_type=None, json_str=None, table_manipulation=None, data_type=None):
def submit_manifest_route(schema_url, asset_view=None, manifest_record_type=None, json_str=None, table_manipulation=None, data_type=None, hide_blanks=False):
# call config_handler()
config_handler(asset_view = asset_view)

Expand Down Expand Up @@ -415,6 +415,7 @@ def submit_manifest_route(schema_url, asset_view=None, manifest_record_type=None
access_token=access_token,
manifest_record_type = manifest_record_type,
restrict_rules = restrict_rules,
hide_blanks=hide_blanks,
table_manipulation = table_manipulation,
use_schema_label=use_schema_label)

Expand Down
1 change: 1 addition & 0 deletions tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,7 @@ def test_submit_manifest_table_and_file_replace(self, client, syn_token, data_mo
"schema_url": data_model_jsonld,
"data_type": "Biospecimen",
"restrict_rules": False,
"hide_blanks": False,
"manifest_record_type": "table_and_file",
"asset_view": "syn51514344",
"dataset_id": "syn51514345",
Expand Down

0 comments on commit 81aefdb

Please sign in to comment.