Skip to content

Improve error handling and remove meta KI names again. #649

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.

Sign up for GitHub

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

Merged
bnouwt merged 1 commit into from
Apr 9, 2025
Merged

Improve error handling and remove meta KI names again. #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions smart-connector-api/src/main/java/eu/knowledge/engine/smartconnector/api/AnswerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import java.util.concurrent.CompletableFuture;

import org.slf4j.LoggerFactory;

/**
* An {@link AnswerHandler} provides a handler
* {@code AnswerHandler#answer(AnswerKnowledgeInteraction, BindingSet)} method
Expand Down Expand Up @@ -36,6 +38,7 @@ public default CompletableFuture<BindingSet> answerAsync(AnswerKnowledgeInteract
BindingSet bs = this.answer(anAKI, anAnswerExchangeInfo);
future.complete(bs);
} catch (Exception e) {
LoggerFactory.getLogger(AnswerHandler.class).error("{}", e);
future.completeExceptionally(e);
}
return future;
Expand Down
10 changes: 5 additions & 5 deletions ...nector-api/src/main/java/eu/knowledge/engine/smartconnector/api/KnowledgeInteraction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

/**
* A {@link KnowledgeInteraction} represents an agreement about the exchange of
* knowledge between the {@link SmartConnector} and the
* {@link KnowledgeBase}. It expresses the 'shape' of knowledge that a
* {@link KnowledgeBase} asks from, or can provide to its
* {@link SmartConnector}.
* knowledge between the {@link SmartConnector} and the {@link KnowledgeBase}.
* It expresses the 'shape' of knowledge that a {@link KnowledgeBase} asks from,
* or can provide to its {@link SmartConnector}.
*/
public abstract class KnowledgeInteraction {

Expand Down Expand Up @@ -131,7 +130,8 @@ public boolean knowledgeGapsEnabled() {
private void validateName(String name) {
if (name != null && !name.matches("[a-zA-Z0-9-]*")) {
throw new IllegalArgumentException(
"Knowledge Interaction names can only contain alphanumeric characters and hyphens.");
"Knowledge Interaction names should only contain alphanumeric characters and hyphens and not '"
+ name + "'");
}
}
}
9 changes: 7 additions & 2 deletions smart-connector-api/src/main/java/eu/knowledge/engine/smartconnector/api/ReactHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@

import java.util.concurrent.CompletableFuture;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* A {@link ReactHandler} provides a handler method
* ({@link ReactHandler#react(ReactKnowledgeInteraction, ReactExchangeInfo)}) that
* returns a {@link BindingSet} for the provided input. Unlike in the
* ({@link ReactHandler#react(ReactKnowledgeInteraction, ReactExchangeInfo)})
* that returns a {@link BindingSet} for the provided input. Unlike in the
* {@link AnswerHandler}, which only has a single {@link GraphPattern}, the
* {@link GraphPattern} of the result *can* be different from the argument's.
*/
Expand Down Expand Up @@ -36,7 +39,9 @@ public default CompletableFuture<BindingSet> reactAsync(ReactKnowledgeInteractio
BindingSet bs = this.react(anRKI, aReactExchangeInfo);
future.complete(bs);
} catch (Exception e) {
LoggerFactory.getLogger(ReactHandler.class).error("{}", e);
future.completeExceptionally(e);

}
return future;
}
Expand Down
12 changes: 6 additions & 6 deletions ...onnector/src/main/java/eu/knowledge/engine/smartconnector/impl/MetaKnowledgeBaseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,25 +102,25 @@ public MetaKnowledgeBaseImpl(LoggerProvider loggerProvider, MessageRouter aMessa
this.metaPostNewKI = new PostKnowledgeInteraction(
new CommunicativeAct(new HashSet<>(Arrays.asList(Vocab.INFORM_PURPOSE)),
new HashSet<>(Arrays.asList(Vocab.NEW_KNOWLEDGE_PURPOSE))),
this.metaGraphPattern, null, "post-new", true, true, MatchStrategy.ENTRY_LEVEL);
this.metaGraphPattern, null, null, true, true, MatchStrategy.ENTRY_LEVEL);
this.knowledgeBaseStore.register(this.metaPostNewKI, true);

this.metaPostChangedKI = new PostKnowledgeInteraction(
new CommunicativeAct(new HashSet<>(Arrays.asList(Vocab.INFORM_PURPOSE)),
new HashSet<>(Arrays.asList(Vocab.CHANGED_KNOWLEDGE_PURPOSE))),
this.metaGraphPattern, null, "post-changed", true, true, MatchStrategy.ENTRY_LEVEL);
this.metaGraphPattern, null, null, true, true, MatchStrategy.ENTRY_LEVEL);
this.knowledgeBaseStore.register(this.metaPostChangedKI, true);

this.metaPostRemovedKI = new PostKnowledgeInteraction(
new CommunicativeAct(new HashSet<>(Arrays.asList(Vocab.INFORM_PURPOSE)),
new HashSet<>(Arrays.asList(Vocab.REMOVED_KNOWLEDGE_PURPOSE))),
this.metaGraphPattern, null, "post-removed", true, true, MatchStrategy.ENTRY_LEVEL);
this.metaGraphPattern, null, null, true, true, MatchStrategy.ENTRY_LEVEL);
this.knowledgeBaseStore.register(this.metaPostRemovedKI, true);

this.metaReactNewKI = new ReactKnowledgeInteraction(
new CommunicativeAct(new HashSet<>(Arrays.asList(Vocab.NEW_KNOWLEDGE_PURPOSE)),
new HashSet<>(Arrays.asList(Vocab.INFORM_PURPOSE))),
this.metaGraphPattern, null, "react-new", true, true, MatchStrategy.ENTRY_LEVEL);
this.metaGraphPattern, null, null, true, true, MatchStrategy.ENTRY_LEVEL);
this.knowledgeBaseStore.register(this.metaReactNewKI, (aRKI, aReactExchangeInfo) -> {
var postingKi = aReactExchangeInfo.getPostingKnowledgeInteractionId();
var itShouldBeThis = this.knowledgeBaseStore.getMetaId(aReactExchangeInfo.getPostingKnowledgeBaseId(),
Expand All @@ -140,7 +140,7 @@ public MetaKnowledgeBaseImpl(LoggerProvider loggerProvider, MessageRouter aMessa
this.metaReactChangedKI = new ReactKnowledgeInteraction(
new CommunicativeAct(new HashSet<>(Arrays.asList(Vocab.CHANGED_KNOWLEDGE_PURPOSE)),
new HashSet<>(Arrays.asList(Vocab.INFORM_PURPOSE))),
this.metaGraphPattern, null, "react-changed", true, true, MatchStrategy.ENTRY_LEVEL);
this.metaGraphPattern, null, null, true, true, MatchStrategy.ENTRY_LEVEL);
this.knowledgeBaseStore.register(this.metaReactChangedKI, (aRKI, aReactExchangeInfo) -> {
var postingKi = aReactExchangeInfo.getPostingKnowledgeInteractionId();
var itShouldBeThis = this.knowledgeBaseStore.getMetaId(aReactExchangeInfo.getPostingKnowledgeBaseId(),
Expand All @@ -160,7 +160,7 @@ public MetaKnowledgeBaseImpl(LoggerProvider loggerProvider, MessageRouter aMessa
this.metaReactRemovedKI = new ReactKnowledgeInteraction(
new CommunicativeAct(new HashSet<>(Arrays.asList(Vocab.REMOVED_KNOWLEDGE_PURPOSE)),
new HashSet<>(Arrays.asList(Vocab.INFORM_PURPOSE))),
this.metaGraphPattern, null, "react-removed", true, true, MatchStrategy.ENTRY_LEVEL);
this.metaGraphPattern, null, null, true, true, MatchStrategy.ENTRY_LEVEL);
this.knowledgeBaseStore.register(this.metaReactRemovedKI, (aRKI, aReactExchangeInfo) -> {
var postingKi = aReactExchangeInfo.getPostingKnowledgeInteractionId();
var itShouldBeThis = this.knowledgeBaseStore.getMetaId(aReactExchangeInfo.getPostingKnowledgeBaseId(),
Expand Down