diff --git a/build.sbt b/build.sbt index a5423a92..3a2b8bde 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ organization := "org.renci" name := "cam-kp-api" -version := "0.3-pre4" +version := "0.3" licenses := Seq("MIT license" -> url("https://opensource.org/licenses/MIT")) diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 893da615..f86f8adb 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -1,5 +1,5 @@ { - version = "0.3-pre4" + version = "0.3" host = 0.0.0.0 port = 8080 port = ${?PORT} diff --git a/src/main/scala/org/renci/cam/QueryService.scala b/src/main/scala/org/renci/cam/QueryService.scala index cd8becfc..8ef405c8 100644 --- a/src/main/scala/org/renci/cam/QueryService.scala +++ b/src/main/scala/org/renci/cam/QueryService.scala @@ -199,9 +199,9 @@ object QueryService extends LazyLogging { appConfig <- getConfig[AppConfig] // Generate the attributes we will need to produce the edge output. - originalKS <- ZIO - .fromOption(biolinkData.predicates.find(p => p.shorthand == "original_knowledge_source")) - .orElseFail(new Exception("could not get biolink:original_knowledge_source")) + primaryKS <- ZIO + .fromOption(biolinkData.predicates.find(p => p.shorthand == "primary_knowledge_source")) + .orElseFail(new Exception("could not get biolink:primary_knowledge_source")) aggregatorKS <- ZIO .fromOption(biolinkData.predicates.find(p => p.shorthand == "aggregator_knowledge_source")) .orElseFail(new Exception("could not get biolink:aggregator_knowledge_source")) @@ -237,7 +237,7 @@ object QueryService extends LazyLogging { } originalKSAttributes = originalKnowledgeSources.map { case (derivedFrom, inforesKS) => TRAPIAttribute(Some("infores:cam-kp"), - originalKS.iri, + primaryKS.iri, None, List(inforesKS), Some(infoResBiolinkClass.iri), @@ -674,9 +674,9 @@ object QueryService extends LazyLogging { predicate = querySolution.getResource(queryEdgeID).getURI predicateIRI = IRI(predicate) tripleString = TripleString(source, predicate, target) - originalKS <- ZIO - .fromOption(biolinkData.predicates.find(p => p.shorthand == "original_knowledge_source")) - .orElseFail(new Exception("could not get biolink:original_knowledge_source")) + primaryKS <- ZIO + .fromOption(biolinkData.predicates.find(p => p.shorthand == "primary_knowledge_source")) + .orElseFail(new Exception("could not get biolink:primary_knowledge_source")) aggregatorKS <- ZIO .fromOption(biolinkData.predicates.find(p => p.shorthand == "aggregator_knowledge_source")) .orElseFail(new Exception("could not get biolink:aggregator_knowledge_source")) @@ -693,19 +693,19 @@ object QueryService extends LazyLogging { Some(appConfig.location), None, None) - originalKSstr = provValue match { + primaryKSstr = provValue match { case ctd if provValue.contains("ctdbase.org") => "infores:ctd" case _ => "infores:go-cam" } - originalKSAttribute = TRAPIAttribute(Some("infores:cam-kp"), - originalKS.iri, - None, - List(originalKSstr), - Some(infoResBiolinkClass.iri), - Some(provValue), - None, - None) - attributes = List(aggregatorKSAttribute, originalKSAttribute) + primaryKSAttribute = TRAPIAttribute(Some("infores:cam-kp"), + primaryKS.iri, + None, + List(primaryKSstr), + Some(infoResBiolinkClass.iri), + Some(provValue), + None, + None) + attributes = List(aggregatorKSAttribute, primaryKSAttribute) relationLabelAndBiolinkPredicate <- ZIO .fromOption(relationsMap.get(predicateIRI)) .orElseFail(new Exception("Unexpected edge relation"))