Skip to content

Commit 9bfce03

Browse files
deprecate evidence and mousePhenotype steps (#402)
* deprecate evidence step and all dependencies * deprecate mousephenotype step and all dependencies
1 parent 0e95e7c commit 9bfce03

File tree

8 files changed

+5
-1104
lines changed

8 files changed

+5
-1104
lines changed

src/main/scala/io/opentargets/etl/Main.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import scala.util._
66
import io.opentargets.etl.backend._
77
import io.opentargets.etl.backend.target.Target
88
import io.opentargets.etl.backend.drug.Drug
9-
import io.opentargets.etl.backend.evidence.Evidence
9+
1010
import io.opentargets.etl.backend.literature.Literature
1111
import io.opentargets.etl.backend.searchFacet.FacetSearch
1212
import io.opentargets.etl.backend.pharmacogenomics.Pharmacogenomics
@@ -19,7 +19,6 @@ object ETL extends LazyLogging {
1919
case "association" => Association()
2020
case "association_otf" => AssociationOTF()
2121
case "drug" => Drug()
22-
case "evidence" => Evidence()
2322
case "expression" => Expression()
2423
case "openfda" => OpenFda()
2524
case "go" => Go()
@@ -34,7 +33,7 @@ object ETL extends LazyLogging {
3433
case "search_facet" => FacetSearch()
3534
case "target" => Target()
3635
case "target_engine" => TargetEngine()
37-
case "mouse_phenotype" => MousePhenotype()
36+
3837
case _ => throw new IllegalArgumentException(s"step $step is unknown")
3938
}
4039
logger.info(s"finished running step $step")

src/main/scala/io/opentargets/etl/backend/Configuration.scala

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -58,35 +58,7 @@ object Configuration extends LazyLogging {
5858
output: IOResourceConfigurations
5959
)
6060

61-
// evidence
62-
case class EvidenceEntry(
63-
id: String,
64-
uniqueFields: List[String],
65-
datatypeId: Option[String],
66-
scoreExpr: String,
67-
excludedBiotypes: Option[List[String]]
68-
)
69-
70-
case class DirectionOfEffectSection(
71-
varFilterLof: List[String],
72-
gof: List[String],
73-
lof: List[String],
74-
oncotsgList: List[String],
75-
inhibitors: List[String],
76-
activators: List[String],
77-
sources: List[String]
78-
)
79-
80-
case class EvidenceSection(
81-
input: IOResourceConfigurations,
82-
uniqueFields: List[String],
83-
scoreExpr: String,
84-
datatypeId: String,
85-
dataSourcesExclude: List[String],
86-
dataSources: List[EvidenceEntry],
87-
directionOfEffect: DirectionOfEffectSection,
88-
output: IOResourceConfigurations
89-
)
61+
9062

9163
// expression
9264
case class ExpressionSection(
@@ -164,11 +136,7 @@ object Configuration extends LazyLogging {
164136
epmc: Epmc
165137
)
166138

167-
// mouse_phenotype
168-
case class MousePhenotypeSection(
169-
input: IOResourceConfigurations,
170-
output: IOResourceConfigurations
171-
)
139+
172140

173141
// openfda
174142
case class OpenfdaMontecarloSection(
@@ -262,13 +230,11 @@ object Configuration extends LazyLogging {
262230
association: AssociationSection,
263231
associationOtf: AssociationOTFSection,
264232
drug: DrugSection,
265-
evidence: EvidenceSection,
266233
expression: ExpressionSection,
267234
go: GOSection,
268235
interaction: InteractionSection,
269236
knownDrug: KnownDrugSection,
270237
literature: LiteratureSection,
271-
mousePhenotype: MousePhenotypeSection,
272238
openfda: OpenfdaSection,
273239
otar: OtarSection,
274240
pharmacogenomics: PharmacogenomicsSection,

src/main/scala/io/opentargets/etl/backend/ETLSessionContext.scala

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,11 @@ object ETLSessionContext extends LazyLogging {
1919
config <- Configuration.config
2020
} yield {
2121
logger.info("Generating ETL Session Context")
22-
val filteredEvidence = if (config.steps.evidence.dataSourcesExclude.nonEmpty) {
23-
logger.info(s"Excluding evidence datasources: ${config.steps.evidence.dataSourcesExclude}")
24-
val ds = config.steps.evidence.dataSources.filter(d =>
25-
!config.steps.evidence.dataSourcesExclude.contains(d.id)
26-
)
27-
config.steps.evidence.copy(dataSources = ds)
28-
} else config.steps.evidence
2922

3023
val configurations = config.sparkSettings.defaultSparkSessionConfig
3124

3225
ETLSessionContext(
33-
config.copy(steps = config.steps.copy(evidence = filteredEvidence)),
26+
config,
3427
getOrCreateSparkSession(progName, configurations, config.sparkUri)
3528
)
3629
}

src/main/scala/io/opentargets/etl/backend/MousePhenotype.scala

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)