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

Dev #326

Merged
merged 141 commits into from
Jun 12, 2020
Merged

Dev #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
1ca9036
for step 4 in #260
Nov 21, 2019
f402f61
improved shex output for batch tests
Dec 6, 2019
8437f74
added ability to select specific shex schema and shapemap
Dec 6, 2019
146858b
changed auto-typing of GPs to dynamic
Dec 10, 2019
ca93e0f
adding some reporting for system state - also hacking around neo in c…
Dec 11, 2019
68331ee
adding prop rdf:type to explanation output and filtering anonymous cl…
Dec 12, 2019
e79cfc1
fixing confusion with travis mode
Dec 12, 2019
95bc102
Merge pull request #265 from geneontology/gene-product-type-updater
goodb Dec 17, 2019
6f28878
adding information on the shapes that do match troublesome nodes.
Dec 18, 2019
2330cd3
Merge pull request #270 from geneontology/improve-explanation-add-sha…
goodb Dec 18, 2019
3273b0f
ignoring
goodb Jan 17, 2020
05b24d6
add id to order by for #235
goodb Jan 17, 2020
c2b9cca
update test
goodb Jan 17, 2020
49ef193
Merge pull request #271 from geneontology/add-id-to-order-by-
goodb Jan 17, 2020
b5732dc
fix ordering for model search
goodb Jan 21, 2020
9ac0d20
Merge pull request #272 from geneontology/model-search-ordering
kltm Jan 21, 2020
93259fd
fix search result for users and groups
goodb Jan 31, 2020
76c3512
Merge pull request #273 from geneontology/fix-contributor-group-searc…
kltm Jan 31, 2020
05cd370
add cache for golr requests
goodb Jan 31, 2020
8b9dcfa
Made GOLR lookup for types run as a batch - one request per model val…
goodb Feb 3, 2020
928d5a1
fixed batch URI for GET added POST method
goodb Feb 4, 2020
f5fb390
adding POST capable Golr as caching service
goodb Feb 4, 2020
56557fc
adding option to control location of golr server used for validation
goodb Feb 5, 2020
166524c
adding check for use of properties outside of intended shape
goodb Feb 8, 2020
bb8d496
working version of SPARQL CLOSE on shex shapes.
goodb Feb 9, 2020
3bcc6bd
Merge pull request #274 from geneontology/performance-go_shapes199
kltm Feb 9, 2020
f522002
addressing shape inheritance issue
goodb Feb 9, 2020
516aa56
Merge pull request #275 from geneontology/performance-go_shapes199
goodb Feb 9, 2020
997632f
fix cruft bug
goodb Feb 11, 2020
7b7f285
improved handling for properties with Literal ranges.
goodb Feb 11, 2020
0254300
Merge pull request #276 from geneontology/performance-go_shapes199
kltm Feb 11, 2020
bda337b
fixing error running command line
goodb Feb 14, 2020
05b370c
Merge pull request #277 from geneontology/bugfix-commandline-shex-con…
goodb Feb 14, 2020
af91c1a
added time out ability to validator
goodb Feb 14, 2020
cc4122c
remove verbose log
goodb Feb 14, 2020
91d04a7
updated ShexValidation service to use different algorithm
goodb Feb 20, 2020
ab6fddd
Merge pull request #278 from geneontology/switch-to-refine-for-valida…
goodb Feb 20, 2020
6d4e5a8
fix use of caching service
goodb Feb 20, 2020
38b43b5
fixed batch request to use cache properly - added test
goodb Feb 20, 2020
3c0e44d
adding lookup test back to test collection
goodb Feb 20, 2020
94387db
fixed cached batch request adding it back to web server
goodb Feb 20, 2020
a489555
added test for shex and owl validation methods
goodb Feb 21, 2020
2a9aea1
start on a junit test for the search service
goodb Feb 24, 2020
56f882f
reasonable first cut at testing framework for search
goodb Feb 24, 2020
2de5755
Merge pull request #279 from geneontology/add-tests-for-validator-search
goodb Feb 25, 2020
8ae8cbb
implemented POST
goodb Feb 25, 2020
62d8d90
running command line client as part of travis.
goodb Feb 26, 2020
45ddeb7
Merge pull request #280 from geneontology/add-POST-to-search-service
goodb Feb 26, 2020
d1fe189
Merge pull request #281 from geneontology/add-commandline-invocations…
goodb Feb 26, 2020
274ca28
added status service at /status for 282
goodb Feb 26, 2020
82b44d5
add startup date to the top..
goodb Feb 28, 2020
f0706bf
added a go rules compatible report option to validation command line
goodb Feb 28, 2020
b9cb927
adding check for redundant model IRIs
goodb Feb 28, 2020
e5aa37a
Merge pull request #284 from geneontology/status-service-282
goodb Feb 28, 2020
1b2d662
Merge pull request #285 from geneontology/add-pipeline-report-to-cmdl…
goodb Feb 28, 2020
83e2827
require golr server specification for command line run
goodb Feb 28, 2020
ddcd4f2
Merge pull request #287 from geneontology/add-pipeline-report-to-cmdl…
goodb Feb 28, 2020
535721c
hopefully improved clarity of command line usage
goodb Mar 3, 2020
4b84f07
Merge pull request #288 from geneontology/clarify-command-line-usage
goodb Mar 3, 2020
70336f0
allowing command line blazegraph load to handle an OWL file
goodb Mar 6, 2020
35912e5
working command line validator with local blazegraph ontology journal
goodb Mar 9, 2020
765524f
not working but no sure cause - ought to be - backstop commit for rol…
goodb Mar 12, 2020
58e76af
backed off query to match up with previously working golr requests
goodb Mar 13, 2020
9544379
cleaning up ontology jounral when shutting down an m3
goodb Mar 13, 2020
2ba141a
added a test case for the tbox ontology manager
goodb Mar 14, 2020
d1cc87b
genes are chemical entities test
goodb Mar 14, 2020
67c04ca
setting up minerva server ontology journal init
goodb Mar 14, 2020
59b68b9
investigating slow server performance
goodb Mar 17, 2020
0d75854
basic tbox search functionality and tests
goodb Mar 21, 2020
721eca0
query expansion working for GO terms
goodb Mar 21, 2020
a3da092
added search by taxon
goodb Mar 21, 2020
5240251
Added update method for the taxon_models cache. activates on save
goodb Mar 22, 2020
c8a2442
functional product for #291
goodb Mar 22, 2020
6c75119
added exact date and date range queries #292
goodb Mar 22, 2020
77a4a8c
added route to list species in gocam repo for #295
goodb Mar 22, 2020
d1624f8
bug fix on contributor search and added tests
goodb Mar 22, 2020
e2030d7
updated test files for validation - fixed a test
goodb Mar 22, 2020
b831d43
removed uses of external lookup service from minerva
goodb Mar 22, 2020
f174ad3
match up params for server and command line
goodb Mar 22, 2020
eb9f824
removing unused import - offending Travis
goodb Mar 22, 2020
6c1f69e
currently set to require a tbox ontology location
goodb Mar 22, 2020
46b0d68
allowing null tbox for command line operations that don't require it.
goodb Mar 22, 2020
e958ec2
can't dispose of nothing
goodb Mar 23, 2020
ff56bbb
not using golr service anyway.. though these test failures may be of …
goodb Mar 23, 2020
ffa6103
thats what tests are for...
goodb Mar 23, 2020
50d29f5
fixed just because..
goodb Mar 23, 2020
5a3ea67
fixed a bunch of tests - mainly closing blazegraph instances not gett…
goodb Mar 23, 2020
31e123a
more dispose
goodb Mar 23, 2020
0990b4b
more disposing for repeated uses of same blazegraph store in differen…
goodb Mar 23, 2020
9086897
Merge pull request #297 from geneontology/blazegraph-for-go-lego-expe…
kltm Mar 23, 2020
b047369
catching parse exception when loading rdf into blazegraph journal
goodb Mar 24, 2020
1569b84
turning off the open sparql service
goodb Mar 25, 2020
cbc61bf
add label to taxon list for #295
goodb Mar 28, 2020
3d7cf3b
added 'expand' as a non-default option for #291
goodb Mar 28, 2020
4ea5571
made the sparql param in the response optional - request with debug f…
goodb Mar 28, 2020
13314bd
cleanup
goodb Mar 29, 2020
f5babdc
reworking taxon search to use annotations in models
goodb Mar 29, 2020
0ae74a8
refactor taxon handling for #290
goodb Mar 29, 2020
4c066c6
fixing bug depending on external look up service
goodb Mar 30, 2020
5e0047c
increase query timeout #291
goodb Apr 1, 2020
82d14d3
Merge pull request #299 from geneontology/bugfixes-on-blazegraph-conv…
goodb Apr 1, 2020
5d99b94
testing
goodb Apr 5, 2020
047a556
update stable location for blazegrpah journal file
goodb Apr 5, 2020
47c8dfa
testing
goodb Apr 5, 2020
d19b0c1
update default blazegraph to stable location with reactome content
goodb Apr 5, 2020
d216f65
fixing model copy in InferenceProviderCreator to maintain access to o…
goodb Apr 7, 2020
1820de1
Merge pull request #306 from geneontology/testing-model-level-shex-va…
goodb Apr 7, 2020
779a519
think bug dead
goodb Apr 7, 2020
c5f96b1
Merge pull request #307 from geneontology/bug-#305-id-lookup-on-save
goodb Apr 7, 2020
34ae01f
take out all super types from response. rendering took forever
goodb Apr 7, 2020
fe29f84
Merge pull request #308 from geneontology/speed-up-reasoner-on-response
kltm Apr 7, 2020
a43dc00
code and test for exact match text search
goodb Apr 23, 2020
60387ef
pinging to restart travis
goodb Apr 24, 2020
2a695cd
changing default download for go-lego-reacto (and neo) journal
goodb Apr 25, 2020
09932d2
noting how to do real exact match in case its needed
goodb Apr 25, 2020
91a8b82
Merge pull request #310 from geneontology/title-search-exact-match-mo…
goodb Apr 25, 2020
1dcab1a
changing routes for search service
goodb Apr 28, 2020
dba219a
Merge pull request #312 from geneontology/issue-311-new-service-route…
kltm Apr 28, 2020
898f004
change ontojournal location
goodb Apr 29, 2020
7035cb3
Merge pull request #313 from geneontology/change-default-ontojournal-…
kltm Apr 29, 2020
866d4a5
changing all root protein to chebi reference
goodb Apr 30, 2020
804246b
Merge pull request #314 from geneontology/eliminate-pro-references
goodb Apr 30, 2020
c9a47a8
have tbox in manager when loading model from blazegraph
goodb May 2, 2020
5da8cad
this seems to be the main problem
goodb May 3, 2020
41dbb57
supporting changes for the IRI thing in the previous commit..
goodb May 3, 2020
893175a
not compiling ???
goodb May 3, 2020
3b7cf1b
removing unused import
goodb May 3, 2020
165d15b
addressing reviewer comment
goodb May 4, 2020
3671305
Merge pull request #316 from geneontology/issue-670
kltm May 4, 2020
efa3375
removing /tmp/blazegraph.jnl references
goodb May 5, 2020
016e869
Merge pull request #317 from geneontology/clean-tmp-blazegrpah-tests
kltm May 5, 2020
85c8bd0
minor update - now assumes pre-merged tbox ontology
goodb May 24, 2020
89fa8d2
Merge pull request #320 from geneontology/update-shex-validation-no-n…
goodb May 24, 2020
971b8e4
Merge branch 'shapes' into dev
goodb May 24, 2020
ee6702f
ignore file always downloaded
goodb Jun 5, 2020
b032d01
fixes #318
goodb Jun 5, 2020
2b5d499
missed a title
goodb Jun 5, 2020
fa66d82
Merge pull request #323 from geneontology/add-title-to-shex-validatio…
goodb Jun 5, 2020
3325514
fixing title printing to file..
goodb Jun 10, 2020
6b4b295
Merge pull request #324 from geneontology/add-title-to-shex-validatio…
goodb Jun 10, 2020
1537214
change it golr end breaks the test... made it match.
goodb Jun 12, 2020
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
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,11 @@ minerva-cli/bin/reactome-entities-blazegraph.jnl
*.jnl
minerva-cli/go-cam-schema.shex
minerva-cli/go-cam-shapes.shapeMap
minerva-cli/shape_report_shouldpass.txt
minerva-cli/shape_explanation_shouldpass.txt
minerva-cli/.DS_Store
minerva-cli/.DS_Store
minerva-server/src/test/resources/validate.shapemap
minerva-server/src/test/resources/validate.shex
minerva-server/src/test/resources/validate.shapemap
minerva-server/src/test/resources/validate.shex
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ jdk:
# Warning: travis fails, when log output >4M
script:
- mvn clean test

- java -jar minerva-cli/bin/minerva-cli.jar --import-owl-models -f minerva-server/src/test/resources/models/should_pass/ -j tmp_blazegraph.jnl
Binary file removed minerva-cli/.DS_Store
Binary file not shown.
11 changes: 10 additions & 1 deletion minerva-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,16 @@
<artifactId>minerva-server</artifactId>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.geneontology</groupId>
<artifactId>whelk_2.12</artifactId>
<version>0.1.3</version>
</dependency>
<dependency>
<groupId>org.obolibrary.robot</groupId>
<artifactId>robot-core</artifactId>
<version>1.6.0</version>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/**
*
*/
package org.geneontology.minerva.cli;

import java.io.File;
import java.io.IOException;
import java.util.Set;

import org.apache.commons.io.FileUtils;
import org.geneontology.minerva.BlazegraphMolecularModelManager;
import org.geneontology.minerva.curie.CurieHandler;
import org.geneontology.minerva.curie.MappedCurieHandler;
import org.openrdf.repository.RepositoryException;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.formats.TurtleDocumentFormat;
import org.semanticweb.owlapi.io.FileDocumentTarget;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLClass;
import org.semanticweb.owlapi.model.OWLClassAssertionAxiom;
import org.semanticweb.owlapi.model.OWLClassExpression;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLNamedIndividual;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
import org.semanticweb.owlapi.reasoner.NodeSet;
import org.semanticweb.owlapi.reasoner.OWLReasoner;
import org.semanticweb.owlapi.reasoner.OWLReasonerFactory;
import org.semanticweb.owlapi.reasoner.structural.StructuralReasonerFactory;
import org.semanticweb.owlapi.search.EntitySearcher;

import com.google.common.collect.Sets;

/**
* @author bgood
*
*/
public class BatchModelUpdater {


}
Loading