Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ajs add file limit #555

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Ajs add file limit #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93e4701
add new kwarg to md5_status to limit number of files
aschroed Dec 18, 2023
2b2e3a9
Merge branch 'master' into ajs_add_file_limit
aschroed Dec 18, 2023
d8c7b76
update change log
aschroed Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,20 @@ foursight
Change Log
----------

4.1.3
=====

* additional improvement to md5status check to add option to limit number of files checked

`PR 555: add file limit option for md5_status <https://github.com/4dn-dcic/foursight/pull/555>`_

4.1.2
=====

* Minor UI fix to Ingestion page (foursight-core).

`PR 554: UI fix to core <https://github.com/4dn-dcic/foursight/pull/554>`_

4.1.1
=====

Expand Down
4 changes: 3 additions & 1 deletion chalicelib_fourfront/checks/wfr_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def md5run_extra_file_start(connection, **kwargs):
return action


@check_function(file_type='File', lab_title=None, start_date=None, action="md5run_start")
@check_function(file_type='File', lab_title=None, start_date=None, file_limit='all', action="md5run_start")
def md5run_status(connection, **kwargs):
"""Searches for files that are uploaded to s3, but not went though md5 run.
This check makes certain assumptions
Expand Down Expand Up @@ -131,6 +131,8 @@ def md5run_status(connection, **kwargs):
lab = kwargs.get('lab_title')
if lab:
query += '&lab.display_title=' + lab
limit = kwargs.get('file_limit')
query += '&limit=' + limit
# The search
res = ff_utils.search_metadata(query, key=my_auth, is_generator=True)
if not any(res):
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "foursight"
version = "4.1.2"
version = "4.1.3"
description = "Serverless Chalice Application for Monitoring"
authors = ["4DN-DCIC Team <[email protected]>"]
license = "MIT"
Expand Down
Loading