Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/pull-request-approved.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
- name: Clone java-common-libs
uses: actions/checkout@v4
with:
repository: opencb/java-common-libs
ref: develop
fetch-depth: '10'
## This is important to avoid the error in the next step: "fatal: repository 'https://github.com/zetta-genomics/opencga-enterprise.git/' not found"
persist-credentials: false
Expand All @@ -25,7 +27,7 @@ jobs:
chmod +x ./.github/workflows/scripts/get-xetabase-branch.sh
echo "github.event.pull_request.base.ref: ${{ github.event.pull_request.base.ref }}"
echo "github.event.pull_request.head.ref: ${{ github.event.pull_request.head.ref }}"
xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.base.ref }})
xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.base.ref }} ${{ github.event.pull_request.head.ref }})
Comment thread Fixed
echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY}
echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT
env:
Expand Down
3 changes: 3 additions & 0 deletions biodata-models/src/main/proto/protobuf/opencb/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,7 @@ message GeneDrugInteraction {
string source = 3;
string study_type = 4;
string type = 5;
string interaction_type = 6;
string chembl_id = 7;
repeated string publications = 8;
}
29 changes: 20 additions & 9 deletions biodata-models/src/main/proto/protobuf/opencb/evidence.proto
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,26 @@ Pharmacogenomics drug response variant classification
* `efficacy` : a variant that affects the efficacy of the treatment
*/
enum DrugResponseClassification {
responsive = 0;
resistant = 1;
toxicity = 2;
indication = 3;
contraindication = 4;
dosing = 5;
increased_monitoring = 6;
efficacy = 7;
}
responsive = 0; // DEPRECATED: kept just for retrocompatibility purposes
altered_sensitivity = 1;
reduced_sensitivity = 2;
increased_sensitivity = 3;
altered_resistance = 4;
increased_resistance = 5;
reduced_resistance = 6;
increased_risk_of_toxicity = 7;
reduced_risk_of_toxicity = 8;
altered_toxicity = 9;
adverse_drug_reaction = 10;
indication = 11;
contraindication = 12;
dosing_alteration = 13;
increased_dose = 14;
reduced_dose = 15;
increased_monitoring = 16;
increased_efficacy = 17;
reduced_efficacy = 18;
altered_efficacy = 19;}

/**
Association of variants to a given trait.
Expand Down
75 changes: 60 additions & 15 deletions biodata-models/src/main/proto/protobuf/opencb/variant.proto
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,47 @@ message SampleEntry {
repeated string data = 3;
}

message IssueEntry {

enum IssueType {
DUPLICATION = 0;
DISCREPANCY = 1;
MENDELIAN_ERROR = 2;
DE_NOVO = 3;
COMPOUND_HETEROZYGOUS = 4;
}

IssueType type = 1;

SampleEntry sample = 2;

map<string, string> data = 3;
}

message VariantScore {

/**
* Variant score ID.
*/
string id = 1;
/**
* Main cohort used for calculating the score.
*/
string cohort1 = 2;
/**
* Optional secondary cohort used for calculating the score.
*/
string cohort2 = 3;
/**
* Score value
*/
float score = 4;
/**
* Score p value
*/
float pValue = 5;
}

message StudyEntry {
string studyId = 1;
repeated FileEntry files = 2;
Expand All @@ -217,22 +258,11 @@ message StudyEntry {
repeated string sampleDataKeys = 4;
repeated SampleEntry samples = 5;
repeated VariantStats stats = 6;
repeated IssueEntry issues = 7;
repeated VariantScore scores = 8;
}

///**
// * Type of structural variation
// * <ul>
// * <li>COPY_NUMBER_GAIN for CNVs</li>
// * <li>COPY_NUMBER_LOSS for CNVs</li>
// * <li>TANDEM_DUPLICATION for DUP</li>
// * </ul>
// */
//enum StructuralVariantType {
// unused = 0; // SO:0001742
//// COPY_NUMBER_GAIN = 0; // SO:0001742
//// COPY_NUMBER_LOSS = 1; // SO:0001743
//// TANDEM_DUPLICATION = 2; // SO:1000173
//}



/*
Expand Down Expand Up @@ -263,6 +293,21 @@ message Breakend {


message StructuralVariation {
/**
* Type of structural variation
* <ul>
* <li>COPY_NUMBER_GAIN for CNVs</li>
* <li>COPY_NUMBER_LOSS for CNVs</li>
* <li>TANDEM_DUPLICATION for DUP</li>
* </ul>
*/
enum StructuralVariantType {
// unused = 0; // SO:0001742
COPY_NUMBER_GAIN = 0; // SO:0001742
COPY_NUMBER_LOSS = 1; // SO:0001743
TANDEM_DUPLICATION = 2; // SO:1000173
}

int32 ciStartLeft = 1;
int32 ciStartRight = 2;
int32 ciEndLeft = 3;
Expand All @@ -283,7 +328,7 @@ message StructuralVariation {
/**
* Structural variation type: COPY_NUMBER_GAIN, COPY_NUMBER_LOSS, TANDEM_DUPLICATION, ...
*/
// StructuralVariantType type = 8;
StructuralVariantType type = 8;

Breakend breakend = 9;
}
Expand Down
Loading
Loading