Improvement to generic query: return resultType properly

ge-semtk · Nov 11, 2021 · c5716db · c5716db
1 parent edf7b06
commit c5716db
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 13 deletions.
diff --git a/...a/com/ge/research/semtk/services/nodeGroupExecution/NodeGroupExecutionRestController.java b/...a/com/ge/research/semtk/services/nodeGroupExecution/NodeGroupExecutionRestController.java
@@ -112,7 +112,6 @@
 public class NodeGroupExecutionRestController {
 
  	static final String SERVICE_NAME = "nodeGroupExecutionService";
- 	static final String JOB_ID_RESULT_KEY = SimpleResultSet.JOB_ID_RESULT_KEY;
 
  	// updated
  	@Autowired
@@ -523,10 +522,10 @@ public JSONObject dispatchAnyJobById(@RequestBody DispatchByIdRequestBody reques
 					requestBody.getLimitOverride(),
 					requestBody.getOffsetOverride(),
 					targetId);
-			String id = ngExecutor.getJobID();
 
 			retval.setSuccess(true);
-			retval.addResult(JOB_ID_RESULT_KEY, id); 
+			retval.addResult(SimpleResultSet.JOB_ID_RESULT_KEY, ngExecutor.getJobID()); 
+			retval.addResult(SimpleResultSet.RESULT_TYPE_KEY, ngExecutor.getResultType().toString());
 
 		}
 		catch(Exception e){
@@ -718,7 +717,7 @@ public JSONObject dispatchSelectByIdSync(@RequestBody DispatchByIdRequestBody re
 					ret = new TableResultSet(simpleJson);
 				} else {
 					// wait for job to complete
-					String jobId = jobIdRes.getResult(JOB_ID_RESULT_KEY);
+					String jobId = jobIdRes.getResult(SimpleResultSet.JOB_ID_RESULT_KEY);
 			    	JobTracker tracker = this.getJobTracker();
 			    	int percentComplete = tracker.waitForPercentOrMsec(jobId, 100, TIMEOUT_SEC * 1000);
 			    	if (percentComplete < 100) {
@@ -926,7 +925,7 @@ public JSONObject dispatchSelectInstanceDataPredicates(@RequestBody InstanceData
 				String id = ngExecutor.getJobID();
 
 				retval.setSuccess(true);
-				retval.addResult(JOB_ID_RESULT_KEY, id);
+				retval.addResult(SimpleResultSet.JOB_ID_RESULT_KEY, id);
 
 			}
 			catch(Exception e){
@@ -982,7 +981,7 @@ public JSONObject dispatchSelectInstanceDataSubjects(@RequestBody InstanceDataCl
 				String id = ngExecutor.getJobID();
 
 				retval.setSuccess(true);
-				retval.addResult(JOB_ID_RESULT_KEY, id);
+				retval.addResult(SimpleResultSet.JOB_ID_RESULT_KEY, id);
 
 			}
 			catch(Exception e){
@@ -1023,7 +1022,7 @@ public JSONObject constructConnectedData(@RequestBody ConstructConnectedDataRequ
 			constructor.start();
 
 			retval.setSuccess(true);
-			retval.addResult(JOB_ID_RESULT_KEY, constructor.getJobId());
+			retval.addResult(SimpleResultSet.JOB_ID_RESULT_KEY, constructor.getJobId());
 
 		} catch(Exception e){
 			retval.setSuccess(false);
@@ -1100,7 +1099,7 @@ public JSONObject dispatchRawSparql(@RequestBody DispatchRawSparqlRequestBody re
 				String id = ngExecutor.getJobID();
 
 				retval.setSuccess(true);
-				retval.addResult(JOB_ID_RESULT_KEY, id);
+				retval.addResult(SimpleResultSet.JOB_ID_RESULT_KEY, id);
 
 			}
 			catch(Exception e){
@@ -1144,7 +1143,7 @@ public JSONObject dispatchRawSparqlUpdate(@RequestBody DispatchRawSparqlRequestB
 				String id = ngExecutor.getJobID();
 
 				retval.setSuccess(true);
-				retval.addResult(JOB_ID_RESULT_KEY, id);
+				retval.addResult(SimpleResultSet.JOB_ID_RESULT_KEY, id);
 
 			}
 			catch(Exception e){

diff --git a/...rc/main/java/com/ge/research/semtk/services/dispatch/DispatcherServiceRestController.java b/...rc/main/java/com/ge/research/semtk/services/dispatch/DispatcherServiceRestController.java
@@ -138,8 +138,7 @@ public JSONObject query(@RequestBody TypedQueryRequestBody requestBody, @Request
 						qt = ngQt != null ? ngQt : AutoGeneratedQueryTypes.SELECT_DISTINCT;
 					}
 					if (rt == null) {
-						SparqlResultTypes ngRt = ng.getReturnTypeOverride();
-						rt = ngRt != null ? ngRt : SparqlResultTypes.TABLE;
+						rt = ng.getResultType();
 					}
 				}
 

diff --git a/...chService/src/main/java/com/ge/research/semtk/services/dispatch/NodegroupRequestBody.java b/...chService/src/main/java/com/ge/research/semtk/services/dispatch/NodegroupRequestBody.java
@@ -22,6 +22,7 @@
 import org.json.simple.parser.ParseException;
 
 import com.ge.research.semtk.belmont.NodeGroup;
+import com.ge.research.semtk.load.utility.SparqlGraphJson;
 import com.ge.research.semtk.utility.LocalLogger;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -41,7 +42,12 @@ public String getJsonRenderedNodeGroup(){
 	public NodeGroup buildNodeGroup() throws Exception{
 		JSONParser prsr = new JSONParser();
 		JSONObject jNodeGroup = (JSONObject) prsr.parse(this.jsonRenderedNodeGroup);
-		return NodeGroup.getInstanceFromJson(jNodeGroup);		
+		if (SparqlGraphJson.isSparqlGraphJson(jNodeGroup)) {
+			SparqlGraphJson sgJson = new SparqlGraphJson(jNodeGroup);
+			jNodeGroup = sgJson.getSNodeGroupJson();
+		} 
+
+		return NodeGroup.getInstanceFromJson(jNodeGroup);
 	}
 
 	public JSONObject buildNodeGroupJson(){

diff --git a/...Library/src/main/java/com/ge/research/semtk/api/nodeGroupExecution/NodeGroupExecutor.java b/...Library/src/main/java/com/ge/research/semtk/api/nodeGroupExecution/NodeGroupExecutor.java
@@ -64,6 +64,7 @@ public class NodeGroupExecutor {
 	private IngestorRestClient ingestClient = null;
 	// internal data.
 	private String currentJobId = null;
+	private SparqlResultTypes resultType = null;
 
 	// the Stored Query Executor will be the heart of the stored Query Executor Service.
 	// all of the most important actions will occur in this class
@@ -93,7 +94,6 @@ public static SparqlConnection get_USE_NODEGROUP_CONN() throws Exception {
 		return new SparqlConnection(USE_NODEGROUP_CONN_STR);
 	}
 
-	//Job ID related
 	public String getJobID(){
 		return this.currentJobId;
 	}
@@ -102,6 +102,14 @@ public void setJobID(String jobID){
 		this.currentJobId = jobID;
 	}
 
+	public SparqlResultTypes getResultType() {
+		return resultType;
+	}
+
+	public void setResultType(SparqlResultTypes resultType) {
+		this.resultType = resultType;
+	}
+
 
 
 
@@ -309,6 +317,13 @@ public void dispatchJob(AutoGeneratedQueryTypes qt, SparqlResultTypes rt, Sparql
 
 		LocalLogger.logToStdOut("Sending a " + qt + " query to the dispatcher...");
 
+		// Determine and set resultType
+		if (rt != null) {
+			this.setResultType(rt);
+		} else {
+			this.setResultType(ng.getResultType());
+		}
+
 		if(externalConstraints != null){
 			LocalLogger.logToStdOut("Setting external constraints: " + externalConstraints.toJSONString());
 		}

diff --git a/sparqlGraphLibrary/src/main/java/com/ge/research/semtk/belmont/AutoGeneratedQueryTypes.java b/sparqlGraphLibrary/src/main/java/com/ge/research/semtk/belmont/AutoGeneratedQueryTypes.java
@@ -47,6 +47,22 @@ public static AutoGeneratedQueryTypes getMatchingValue(String s) throws Exceptio
 		return AutoGeneratedQueryTypes.valueOf(lookup);
 	}
 
+	public SparqlResultTypes getDefaultResultType() {
+		switch (this) {
+		case SELECT_DISTINCT:
+		case FILTER_CONSTRAINT:  
+		case COUNT:  
+		case ASK:  
+			return SparqlResultTypes.TABLE;
+		case DELETE:
+			return SparqlResultTypes.CONFIRM;
+		case CONSTRUCT:  
+			return SparqlResultTypes.GRAPH_JSONLD;
+		default:
+			return SparqlResultTypes.TABLE;
+		}
+	}
+
 	public void throwExceptionIfIncompatible(SparqlResultTypes rt) throws Exception {
 		switch (this) {
 		case SELECT_DISTINCT:

diff --git a/sparqlGraphLibrary/src/main/java/com/ge/research/semtk/belmont/NodeGroup.java b/sparqlGraphLibrary/src/main/java/com/ge/research/semtk/belmont/NodeGroup.java
@@ -461,6 +461,20 @@ public SparqlResultTypes getReturnTypeOverride() {
 	public void setReturnTypeOverride(SparqlResultTypes returnTypeOverride) {
 		this.returnTypeOverride = returnTypeOverride;
 	}
+
+	/**
+	 * Get the result type that will be returned by this query
+	 * @return
+	 */
+	public SparqlResultTypes getResultType() {
+		if (this.returnTypeOverride != null) {
+			return this.returnTypeOverride;
+		} else if (this.queryType != null) {
+			return this.queryType.getDefaultResultType();
+		} else {
+			return SparqlResultTypes.TABLE;
+		}
+	}
 
 	public void clearOrderBy() {
 		this.orderBy = new ArrayList<OrderElement>();