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.

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

Beiwe taskrunner #228

Merged
merged 14 commits into from
Jan 16, 2024
Merged

Beiwe taskrunner #228

merged 14 commits into from
Jan 16, 2024

Conversation

biblicabeebli
Copy link
Member

This code makes the following intentional changes:

  • Beiwe requires that output CSVs for its consumption to go into a folder named daily. Willow, Sycamore, Oak, and Jasmine have all had modifications to place output into a well-named folder based on the input frequency.
  • In order to accommodate the above and make the code DRYer Sycamore, Willow, and Jasmine, needed some refactoring. Willow in particular got a new log_stats_inner function that also reduces indentation by.... 4 levels I think?
  • Sycamore Defintely had a bug - original code:
     if end_date is None:
        end_date = get_month_from_today()  # this just inserts end_date if it wasn't provided

    # Read, aggregate and clean data
    else:
        # And then the rest of the function was indented here inside the else block.
  • This merge request includes a fix from hackdna/fix-logging because the code previously set/reset the global logging level, which matters on a server.

As far as I know nothing was broken by my changes. My current setup of Beiwe's django test runner with the forest library present appears to find and run the Forest test suite without errors.

I do see #227 and I believe the code in my branch is better suited than existing code for adding additional frequency options.

@biblicabeebli
Copy link
Member Author

Oh, it looks like tests Don't pass, I will have to go work that out.

@biblicabeebli
Copy link
Member Author

mypy and flake8 issues are now addressed, normal tests did pass.

Copy link
Member

@hackdna hackdna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay. The tests are failing on Windows now: https://github.com/onnela-lab/forest/actions/runs/7187576824/job/19575427334#step:10:1109
It looks like this is related to #211. I am trying to figure out the best way forward, suggestions welcome (@clementzach).

@biblicabeebli
Copy link
Member Author

Ok, this can sit for a while pending various platform issues, but I do need to reference this commit hash in the beiwe-backend codebase.
I'll do my best to merge in any changes on develop so the merge can happen, if I do any further work it will be on top of this branch.

Regarding the librosa dependency bug, I can be flexible on when that dictates the backend/platforrm changes need to be developed - definitely not before the new year.

@hackdna
Copy link
Member

hackdna commented Dec 14, 2023

@GeorgeEfstathiadis since this PR touches some of your code could you have a look and approve if this all looks good to you?

Copy link
Member

@hackdna hackdna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Just a couple of minor items to address with logging. I've fixed the mp3 dependency issue in Windows. LGTM otherwise, just waiting for approval from @GeorgeEfstathiadis.

Copy link
Collaborator

@GeorgeEfstathiadis GeorgeEfstathiadis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reviewed jasmine and oak changes and it looks good to me

@biblicabeebli
Copy link
Member Author

@hackdna I've shifted the log statements to the logger format as requested.

I'd like to keep the branch name around for anticipated future work related to the beiwe taskrunner, currerntly summarized on https://github.com/onnela-lab/beiwe-discussions/issues/222

Copy link
Member

@hackdna hackdna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! We try to keep feature branches as short lived as possible to reduce merge conflicts. I'm going to merge this PR, so please create a new branch off develop for future changes.

@hackdna hackdna merged commit 6355d51 into develop Jan 16, 2024
4 checks passed
@hackdna hackdna deleted the beiwe-taskrunner branch January 16, 2024 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants