-
Notifications
You must be signed in to change notification settings - Fork 23
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
Feature/multiple reasoner sources2 #823
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This looks like it supplants #804 - is that so? If the case, we should close that PR. |
bplatz
reviewed
Jul 8, 2024
bplatz
reviewed
Jul 8, 2024
bplatz
reviewed
Jul 8, 2024
bplatz
reviewed
Jul 8, 2024
JaceRockman
force-pushed
the
feature/multiple-reasoner-sources2
branch
from
July 17, 2024 18:15
05cecb9
to
3d33786
Compare
Only works with query-connection since you need a conn to get a db from a ledger name.
Additionally, fix the json-ld api reason function.
This ensures that if something breaks that would end up always returning a success, then we will catch that as a failure as well.
When two sources include rules with the same @id, deduplicate them and use them all when performing reasoning.
JaceRockman
force-pushed
the
feature/multiple-reasoner-sources2
branch
from
July 22, 2024 17:16
3d33786
to
015b478
Compare
Now overwrites duplicate ids instead of deduplicating them.
zonotope
reviewed
Jul 31, 2024
dpetran
reviewed
Aug 5, 2024
dpetran
reviewed
Aug 8, 2024
zonotope
reviewed
Aug 8, 2024
dpetran
reviewed
Aug 12, 2024
dpetran
reviewed
Aug 12, 2024
dpetran
reviewed
Aug 12, 2024
dpetran
approved these changes
Aug 13, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. @zonotope any other feedback, or do you reckon this is ready to merge?
zonotope
reviewed
Aug 14, 2024
zonotope
approved these changes
Aug 19, 2024
bplatz
added a commit
that referenced
this pull request
Aug 22, 2024
commit 7953e7e Merge: bbbd116 770c53f Author: Daniel Petranek <[email protected]> Date: Wed Aug 21 22:46:41 2024 -0500 Merge pull request #872 from fluree/fix/sparql-numeric-exprs support whitespace in additive expressions commit 770c53f Author: Daniel Petranek <[email protected]> Date: Wed Aug 21 14:45:23 2024 -0500 support whitespace in additive expressions commit bbbd116 Merge: 9cf80f8 d03f791 Author: Daniel Petranek <[email protected]> Date: Wed Aug 21 12:46:56 2024 -0500 Merge pull request #871 from fluree/fix/sparql-parsing-updates Fix/sparql parsing updates commit d03f791 Author: Daniel Petranek <[email protected]> Date: Tue Aug 20 13:59:48 2024 -0500 allow whitespace after limit/offset clauses commit 48e4c2b Author: Daniel Petranek <[email protected]> Date: Tue Aug 20 14:00:05 2024 -0500 put union patterns into a sequence This was working as long as all the patterns were node patterns, but if you have non-node patterns then those need to be in a sequence. commit 7aaba85 Author: Daniel Petranek <[email protected]> Date: Tue Aug 20 11:39:46 2024 -0500 handle UnaryExpressions explicitly commit a1da5e2 Author: Daniel Petranek <[email protected]> Date: Tue Aug 20 11:26:17 2024 -0500 accept lower case sparql functions commit 9cf80f8 Merge: 02e070a 9848819 Author: Ben Lamothe <[email protected]> Date: Mon Aug 19 17:54:40 2024 +0000 Merge pull request #862 from fluree/refactor/id-datatype Use "@id" as the data type for IRIs commit 02e070a Merge: 18cfa46 2bee4ff Author: JaceRockman <[email protected]> Date: Mon Aug 19 11:59:57 2024 -0500 Merge pull request #823 from fluree/feature/multiple-reasoner-sources2 Feature/multiple reasoner sources2 commit 9848819 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 21:00:23 2024 -0400 set datatype for @type and rdfs:Class to @id commit e1140e4 Merge: 6bfd485 a5d4167 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:50:56 2024 -0400 Merge branch 'fix/serialize-schema-sets' into refactor/id-datatype commit 6bfd485 Merge: 1bf9507 18cfa46 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:50:15 2024 -0400 Merge remote-tracking branch 'origin/main' into refactor/id-datatype commit a5d4167 Merge: 6689e0d 18cfa46 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:30:27 2024 -0400 Merge remote-tracking branch 'origin/main' into fix/serialize-schema-sets commit 6689e0d Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:29:51 2024 -0400 cleanup commit 35c87ec Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:17:23 2024 -0400 slightly better name commit f761661 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:15:16 2024 -0400 turn explanatory comment into ns docstring commit bb5997a Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:14:40 2024 -0400 ensure that @type and rdfs:Class have complete property maps commit ee8daba Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 16:34:03 2024 -0400 follow argument order convention commit 68783f1 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 15:44:59 2024 -0400 remove unused function and binding commit 50fbaa1 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 13:53:35 2024 -0400 follow argument order conventions commit d905c91 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 13:49:13 2024 -0400 cleanup commit cebc79a Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 12:30:42 2024 -0400 cleanup commit 2b73725 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 11:23:04 2024 -0400 clarify explanatory comment commit 2bee4ff Author: Jace Rockman <[email protected]> Date: Wed Aug 14 12:03:55 2024 -0500 Throw warning instead of error on duplicate rules commit 40b96f3 Author: Jace Rockman <[email protected]> Date: Wed Aug 14 12:02:33 2024 -0500 Clean up restrict-db and remove deduplicate function commit 18109b2 Author: Jace Rockman <[email protected]> Date: Wed Aug 14 11:47:09 2024 -0500 Fix load-aliased-rule-dbs function commit 1bf9507 Author: Benjamin Lamothe <[email protected]> Date: Wed Aug 14 07:50:28 2024 -0400 use id iri constant commit d84c779 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 9 17:48:11 2024 -0400 add back anyURI as a default data type commit a184e0a Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 9 17:46:20 2024 -0400 update hashes in tests commit c0c27b6 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 9 17:28:32 2024 -0400 use "@id" instead of "xsd:anyURI" as the datatype for iris commit 5347fb4 Author: Jace Rockman <[email protected]> Date: Mon Aug 12 17:33:18 2024 -0500 Fix formatting and remove println from test commit 626d8c2 Author: Jace Rockman <[email protected]> Date: Fri Aug 9 10:00:08 2024 -0500 Make calls to recur single lines commit 6a6adcd Author: Jace Rockman <[email protected]> Date: Thu Aug 8 14:00:17 2024 -0500 Fix extract-rules-from-dbs so that it uses go-try commit 2f5cb76 Author: Jace Rockman <[email protected]> Date: Thu Aug 8 13:31:31 2024 -0500 Reduce nesting in rules-from-dbs with new function commit 6a3b336 Author: Jace Rockman <[email protected]> Date: Thu Aug 8 13:21:18 2024 -0500 Fix duplicate quere.exec requirement commit 775540a Author: Jace Rockman <[email protected]> Date: Tue Aug 6 12:56:00 2024 -0500 Improve async loops to be more idiomatic commit 7e85bfb Author: Jace Rockman <[email protected]> Date: Mon Aug 5 17:18:24 2024 -0500 Remove mixed usage of pipeline-async and <? commit 53e3c74 Author: Jace Rockman <[email protected]> Date: Thu Aug 1 11:37:42 2024 -0500 Multiple fixes to make code more idiomatic commit 88d62df Author: Jace Rockman <[email protected]> Date: Tue Jul 23 15:42:37 2024 -0700 Remove duplicate function declarations commit 192d907 Author: Jace Rockman <[email protected]> Date: Tue Jul 23 14:35:04 2024 -0700 Remove flake.reasoner dependency of itself commit 97c1ea6 Author: Jace Rockman <[email protected]> Date: Tue Jul 23 14:27:02 2024 -0700 Warn when duplicate ids are detected Now overwrites duplicate ids instead of deduplicating them. commit ce33dcc Author: Jace Rockman <[email protected]> Date: Tue Jul 23 14:02:50 2024 -0700 Improve db vs graph identification commit a24d8e8 Author: Jace Rockman <[email protected]> Date: Tue Jul 23 11:19:41 2024 -0700 Make compatible with new reasoner structure commit 015b478 Author: Jace Rockman <[email protected]> Date: Fri Jul 12 13:17:05 2024 -0700 Add docstring to deduplicate function commit 6c01ebc Author: Jace Rockman <[email protected]> Date: Fri Jul 12 12:40:09 2024 -0700 Fix reference to api.query commit 6195824 Author: Jace Rockman <[email protected]> Date: Fri Jul 12 12:22:57 2024 -0700 Move api.query to query.api commit c00b819 Author: Jace Rockman <[email protected]> Date: Thu Jul 11 11:46:38 2024 -0700 Reason with a list of rule-sources not dbs and graphs commit 3b3c37a Author: Jace Rockman <[email protected]> Date: Tue Jun 25 13:04:11 2024 -0700 Update sample data and tests for owl reasoning tests commit 4e16c86 Author: Jace Rockman <[email protected]> Date: Fri Jun 21 14:24:54 2024 -0500 Handle duplicate rule ids from multiple sources When two sources include rules with the same @id, deduplicate them and use them all when performing reasoning. commit 799f0f3 Author: Jace Rockman <[email protected]> Date: Thu Jun 20 15:19:25 2024 -0500 Add negative test cases for multiple rule sources This ensures that if something breaks that would end up always returning a success, then we will catch that as a failure as well. commit 2bba7dd Author: Jace Rockman <[email protected]> Date: Thu Jun 20 15:06:32 2024 -0500 Add datalog tests for multiple rule sources Additionally, fix the json-ld api reason function. commit 568459b Author: Jace Rockman <[email protected]> Date: Wed Jun 19 15:57:15 2024 -0500 Fix tests and api usage of reasoner/reason commit dd0d8aa Author: Jace Rockman <[email protected]> Date: Wed Jun 19 15:28:30 2024 -0500 Make parse-rule-dbs and rules-from-dbs asynchronous commit 68dc6d0 Author: Jace Rockman <[email protected]> Date: Wed Jun 19 11:24:37 2024 -0500 Allow reasoning with ledger names as rule sources Only works with query-connection since you need a conn to get a db from a ledger name. commit 10d8f0c Author: Jace Rockman <[email protected]> Date: Tue Jun 18 15:02:03 2024 -0500 Aggregate rules from graphs and dbs when reasoning commit d2e7f2c Author: Jace Rockman <[email protected]> Date: Tue Jun 11 14:33:40 2024 -0500 Include reasoning logic when restricting db
bplatz
added a commit
that referenced
this pull request
Aug 22, 2024
commit a5929ff Author: Brian Platz <[email protected]> Date: Thu Aug 22 09:35:26 2024 -0400 Revert "Squashed commit of the following:" This reverts commit 60a50a2. commit 60a50a2 Author: Brian Platz <[email protected]> Date: Thu Aug 22 09:32:40 2024 -0400 Squashed commit of the following: commit 7953e7e Merge: bbbd116 770c53f Author: Daniel Petranek <[email protected]> Date: Wed Aug 21 22:46:41 2024 -0500 Merge pull request #872 from fluree/fix/sparql-numeric-exprs support whitespace in additive expressions commit 770c53f Author: Daniel Petranek <[email protected]> Date: Wed Aug 21 14:45:23 2024 -0500 support whitespace in additive expressions commit bbbd116 Merge: 9cf80f8 d03f791 Author: Daniel Petranek <[email protected]> Date: Wed Aug 21 12:46:56 2024 -0500 Merge pull request #871 from fluree/fix/sparql-parsing-updates Fix/sparql parsing updates commit d03f791 Author: Daniel Petranek <[email protected]> Date: Tue Aug 20 13:59:48 2024 -0500 allow whitespace after limit/offset clauses commit 48e4c2b Author: Daniel Petranek <[email protected]> Date: Tue Aug 20 14:00:05 2024 -0500 put union patterns into a sequence This was working as long as all the patterns were node patterns, but if you have non-node patterns then those need to be in a sequence. commit 7aaba85 Author: Daniel Petranek <[email protected]> Date: Tue Aug 20 11:39:46 2024 -0500 handle UnaryExpressions explicitly commit a1da5e2 Author: Daniel Petranek <[email protected]> Date: Tue Aug 20 11:26:17 2024 -0500 accept lower case sparql functions commit 9cf80f8 Merge: 02e070a 9848819 Author: Ben Lamothe <[email protected]> Date: Mon Aug 19 17:54:40 2024 +0000 Merge pull request #862 from fluree/refactor/id-datatype Use "@id" as the data type for IRIs commit 02e070a Merge: 18cfa46 2bee4ff Author: JaceRockman <[email protected]> Date: Mon Aug 19 11:59:57 2024 -0500 Merge pull request #823 from fluree/feature/multiple-reasoner-sources2 Feature/multiple reasoner sources2 commit 9848819 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 21:00:23 2024 -0400 set datatype for @type and rdfs:Class to @id commit e1140e4 Merge: 6bfd485 a5d4167 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:50:56 2024 -0400 Merge branch 'fix/serialize-schema-sets' into refactor/id-datatype commit 6bfd485 Merge: 1bf9507 18cfa46 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:50:15 2024 -0400 Merge remote-tracking branch 'origin/main' into refactor/id-datatype commit a5d4167 Merge: 6689e0d 18cfa46 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:30:27 2024 -0400 Merge remote-tracking branch 'origin/main' into fix/serialize-schema-sets commit 6689e0d Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:29:51 2024 -0400 cleanup commit 35c87ec Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:17:23 2024 -0400 slightly better name commit f761661 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:15:16 2024 -0400 turn explanatory comment into ns docstring commit bb5997a Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 20:14:40 2024 -0400 ensure that @type and rdfs:Class have complete property maps commit ee8daba Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 16:34:03 2024 -0400 follow argument order convention commit 68783f1 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 15:44:59 2024 -0400 remove unused function and binding commit 50fbaa1 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 13:53:35 2024 -0400 follow argument order conventions commit d905c91 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 13:49:13 2024 -0400 cleanup commit cebc79a Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 12:30:42 2024 -0400 cleanup commit 2b73725 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 16 11:23:04 2024 -0400 clarify explanatory comment commit 2bee4ff Author: Jace Rockman <[email protected]> Date: Wed Aug 14 12:03:55 2024 -0500 Throw warning instead of error on duplicate rules commit 40b96f3 Author: Jace Rockman <[email protected]> Date: Wed Aug 14 12:02:33 2024 -0500 Clean up restrict-db and remove deduplicate function commit 18109b2 Author: Jace Rockman <[email protected]> Date: Wed Aug 14 11:47:09 2024 -0500 Fix load-aliased-rule-dbs function commit 1bf9507 Author: Benjamin Lamothe <[email protected]> Date: Wed Aug 14 07:50:28 2024 -0400 use id iri constant commit d84c779 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 9 17:48:11 2024 -0400 add back anyURI as a default data type commit a184e0a Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 9 17:46:20 2024 -0400 update hashes in tests commit c0c27b6 Author: Benjamin Lamothe <[email protected]> Date: Fri Aug 9 17:28:32 2024 -0400 use "@id" instead of "xsd:anyURI" as the datatype for iris commit 5347fb4 Author: Jace Rockman <[email protected]> Date: Mon Aug 12 17:33:18 2024 -0500 Fix formatting and remove println from test commit 626d8c2 Author: Jace Rockman <[email protected]> Date: Fri Aug 9 10:00:08 2024 -0500 Make calls to recur single lines commit 6a6adcd Author: Jace Rockman <[email protected]> Date: Thu Aug 8 14:00:17 2024 -0500 Fix extract-rules-from-dbs so that it uses go-try commit 2f5cb76 Author: Jace Rockman <[email protected]> Date: Thu Aug 8 13:31:31 2024 -0500 Reduce nesting in rules-from-dbs with new function commit 6a3b336 Author: Jace Rockman <[email protected]> Date: Thu Aug 8 13:21:18 2024 -0500 Fix duplicate quere.exec requirement commit 775540a Author: Jace Rockman <[email protected]> Date: Tue Aug 6 12:56:00 2024 -0500 Improve async loops to be more idiomatic commit 7e85bfb Author: Jace Rockman <[email protected]> Date: Mon Aug 5 17:18:24 2024 -0500 Remove mixed usage of pipeline-async and <? commit 53e3c74 Author: Jace Rockman <[email protected]> Date: Thu Aug 1 11:37:42 2024 -0500 Multiple fixes to make code more idiomatic commit 88d62df Author: Jace Rockman <[email protected]> Date: Tue Jul 23 15:42:37 2024 -0700 Remove duplicate function declarations commit 192d907 Author: Jace Rockman <[email protected]> Date: Tue Jul 23 14:35:04 2024 -0700 Remove flake.reasoner dependency of itself commit 97c1ea6 Author: Jace Rockman <[email protected]> Date: Tue Jul 23 14:27:02 2024 -0700 Warn when duplicate ids are detected Now overwrites duplicate ids instead of deduplicating them. commit ce33dcc Author: Jace Rockman <[email protected]> Date: Tue Jul 23 14:02:50 2024 -0700 Improve db vs graph identification commit a24d8e8 Author: Jace Rockman <[email protected]> Date: Tue Jul 23 11:19:41 2024 -0700 Make compatible with new reasoner structure commit 015b478 Author: Jace Rockman <[email protected]> Date: Fri Jul 12 13:17:05 2024 -0700 Add docstring to deduplicate function commit 6c01ebc Author: Jace Rockman <[email protected]> Date: Fri Jul 12 12:40:09 2024 -0700 Fix reference to api.query commit 6195824 Author: Jace Rockman <[email protected]> Date: Fri Jul 12 12:22:57 2024 -0700 Move api.query to query.api commit c00b819 Author: Jace Rockman <[email protected]> Date: Thu Jul 11 11:46:38 2024 -0700 Reason with a list of rule-sources not dbs and graphs commit 3b3c37a Author: Jace Rockman <[email protected]> Date: Tue Jun 25 13:04:11 2024 -0700 Update sample data and tests for owl reasoning tests commit 4e16c86 Author: Jace Rockman <[email protected]> Date: Fri Jun 21 14:24:54 2024 -0500 Handle duplicate rule ids from multiple sources When two sources include rules with the same @id, deduplicate them and use them all when performing reasoning. commit 799f0f3 Author: Jace Rockman <[email protected]> Date: Thu Jun 20 15:19:25 2024 -0500 Add negative test cases for multiple rule sources This ensures that if something breaks that would end up always returning a success, then we will catch that as a failure as well. commit 2bba7dd Author: Jace Rockman <[email protected]> Date: Thu Jun 20 15:06:32 2024 -0500 Add datalog tests for multiple rule sources Additionally, fix the json-ld api reason function. commit 568459b Author: Jace Rockman <[email protected]> Date: Wed Jun 19 15:57:15 2024 -0500 Fix tests and api usage of reasoner/reason commit dd0d8aa Author: Jace Rockman <[email protected]> Date: Wed Jun 19 15:28:30 2024 -0500 Make parse-rule-dbs and rules-from-dbs asynchronous commit 68dc6d0 Author: Jace Rockman <[email protected]> Date: Wed Jun 19 11:24:37 2024 -0500 Allow reasoning with ledger names as rule sources Only works with query-connection since you need a conn to get a db from a ledger name. commit 10d8f0c Author: Jace Rockman <[email protected]> Date: Tue Jun 18 15:02:03 2024 -0500 Aggregate rules from graphs and dbs when reasoning commit d2e7f2c Author: Jace Rockman <[email protected]> Date: Tue Jun 11 14:33:40 2024 -0500 Include reasoning logic when restricting db commit e681284 Author: Brian Platz <[email protected]> Date: Wed Aug 21 06:21:04 2024 -0400 update json-ld library commit 74bd598 Author: Brian Platz <[email protected]> Date: Wed Aug 21 06:20:55 2024 -0400 stage-triples tx api, dry things up
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.