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

Merge latest staging with Job execution #710

Merged
merged 10 commits into from
Jan 21, 2025
Merged

Conversation

alanbchristie
Copy link
Collaborator

No description provided.

Added fields to store version (ExperimentUpload)
Fields in ExperimentUpload table to record incoming data version, checks in loader to ensure only up-to-date data is loaded.
Fails if major version doesn't match.

Also contains changes necessary for XCA data uploader tool.
ExperimentUpload objects output, better format and filters (issue 1627)
Additional fields to api/target_experiment_uploads endpoint (issue 1627)
@alanbchristie alanbchristie merged commit 7a61fb6 into m2ms-1559-job-execution Jan 21, 2025
2 checks passed
alanbchristie added a commit that referenced this pull request Jan 23, 2025
* fix: Attempt to fix AS api check and missing JobRequest view

* fix: Fix missing as_view()

* build: Use of package-mode to avoid "does not contain any element" error

* build: Revert package mode

* fix: Better AS/DM errors logs

* fix: DM and AS response expected to be 200

* fix: Transfer and Job views now return 202 (was 200)

* fix: Switch to using longcode query

* docs: Add a dev note for file transfer

* docs: Doc tweak

* refactor: Minor style change (assignment)

* fix: An attempt to fix the file transfer validation

* style: Adds log to file-transfer validation

* docs: Doc tweak (no model change)

* fix: Attempt to fix file transfer (file/path references)

* style: More log on transfer

* fix: Fix FILE_ROOT

* fix: Fix JobRequest has-finished check

* fix: Better Job launch debug

* fix: Attempt to fix job launch error

* fix: Attempt to fix non-serialisable DmApiRv

* fix: Protein and compound now checked against target

* fix: Fix lint issue

* fix: Fix use of Target pk rather than Title

* style: Extra debug in set_mol()

* style: Adjust log

* style: Alter slit to use '-' rather than '_' (squonk job execution)

* style: Back to original split

* fix: Hack SIteObservation search (job execution experiment)

* fix: Incorrect substitution in hack

* fix: Fix clean-up CS name

* fix: Creating ober-ride now returns 201 (as 200)

* fix: Job config now returns the full list

* fix: RHS lookup now tries to get long-code from ref-mols

* fix: Attempt to move job-request to /api

* fix: Fix view (for API)

* fix: More build fixes

* fix: Attempt to fix JR view

* fix: FileTransfer now 'unquotes' the proteins & compounds

* fix: JobRequest now does an unquote() on the JobSpec

* fix: Fix ')' in longcode

* fix: Attempt to move job_access to /api

* fix: Better exception handling

* Merge latest staging with Job execution (#710)

* feat: data version checker

Added fields to store version (ExperimentUpload)

* stashing

* stashing

* feat: Adds LHS data versioning

Fields in ExperimentUpload table to record incoming data version, checks in loader to ensure only up-to-date data is loaded.
Fails if major version doesn't match.

Also contains changes necessary for XCA data uploader tool.

* feat: ExperimentUpload objects output, better format and filters

* feat: additional fields to api/target_experiment_uploads endpoint

---------

Co-authored-by: Kalev Takkis <[email protected]>

* feat: Attempt to add a /reset endpoint (and fix job_access)

* fix: Attempt to fix run-time errors

* fix: Attempt to fix reset view

* fix: Attempt to fix job-access endpoint

* fix: Use of mixin for JobAccess

* feat: Attempt to fix job-access view

* fix: Attempt to fix reset view

* feat: Extra logging on reset

* fix: Attempt to fix reset endpoint

* fix: Help extensions understand the DB engine

* feat: Removed reset view

* fix: Add debug for upload

* fix: Fix overrride for latest Jobs

* style: Log adjustments

---------

Co-authored-by: Alan Christie <[email protected]>
Co-authored-by: Kalev Takkis <[email protected]>
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.

2 participants