From 403bce05efa2fdb449ec2102b21d5c8334f7836f Mon Sep 17 00:00:00 2001
From: Joshua Send <joshuasend1@gmail.com>
Date: Mon, 28 Oct 2019 16:37:30 +0000
Subject: [PATCH 1/3] WIP

---
 session/Answer.proto  | 21 +++++++++++++--------
 session/Session.proto |  8 ++++++++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/session/Answer.proto b/session/Answer.proto
index c5be0618..fb2005f7 100644
--- a/session/Answer.proto
+++ b/session/Answer.proto
@@ -37,41 +37,46 @@ message Answer {
     }
 }
 
-message Explanation {
+message Cause {
     string pattern = 1;
-    repeated ConceptMap answers = 2;
+}
+
+message Explanation {
+    message Req {
+        ConceptMap answer;
+    }
+    message Iter {
+        message Res {
+            ConceptMap conceptMap = 1;
+        }
+    }
 }
 
 message AnswerGroup {
     Concept owner = 1;
     repeated Answer answers = 2;
-    Explanation explanation = 3;
 }
 
 message ConceptMap {
     map<string, Concept> map = 1;
-    Explanation explanation = 2;
+    Cause cause = 2;
 }
 
 message ConceptList {
     ConceptIds list = 1;
-    Explanation explanation = 2;
 }
 
 message ConceptSet {
     ConceptIds set = 1;
-    Explanation explanation = 2;
 }
 
 message ConceptSetMeasure {
     ConceptIds set = 1;
     Number measurement = 2;
-    Explanation explanation = 3;
 }
 
 message Value {
     Number number = 1;
-    Explanation explanation = 2;
 }
 
 message Void {
diff --git a/session/Session.proto b/session/Session.proto
index fbcc75ca..da9f98fd 100644
--- a/session/Session.proto
+++ b/session/Session.proto
@@ -106,6 +106,7 @@ message Transaction {
                 Query.Iter.Res query_iter_res = 2;
                 GetAttributes.Iter.Res getAttributes_iter_res = 3;
                 Method.Iter.Res conceptMethod_iter_res = 4;
+                Explanation.Iter.Res explanation_iter_res = 5;
             }
         }
     }
@@ -243,4 +244,11 @@ message Transaction {
             Method.Res response = 1;
         }
     }
+
+    message ExplanationMethod {
+        message Req {
+            string id = 1;
+            Explanation.Req = 2;
+        }
+    }
 }
\ No newline at end of file

From a8dcc009306a65a5da541e65f56b79ba2907e980 Mon Sep 17 00:00:00 2001
From: Joshua Send <joshuasend1@gmail.com>
Date: Mon, 28 Oct 2019 17:10:17 +0000
Subject: [PATCH 2/3] Expand proto for iterating explanation ConceptMaps

---
 session/Answer.proto  | 6 +++++-
 session/Session.proto | 9 ++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/session/Answer.proto b/session/Answer.proto
index fb2005f7..505163aa 100644
--- a/session/Answer.proto
+++ b/session/Answer.proto
@@ -43,7 +43,11 @@ message Cause {
 
 message Explanation {
     message Req {
-        ConceptMap answer;
+        ConceptMap answer = 1;
+    }
+    message Res {
+        int32 iter_id = 1;
+        ConceptMap conceptMap = 2;
     }
     message Iter {
         message Res {
diff --git a/session/Session.proto b/session/Session.proto
index da9f98fd..019d2599 100644
--- a/session/Session.proto
+++ b/session/Session.proto
@@ -76,6 +76,7 @@ message Transaction {
             PutRole.Req putRole_req = 11;
             PutRule.Req putRule_req = 12;
             ConceptMethod.Req conceptMethod_req = 13;
+            Explanation.Req explanation_req = 14;
         }
     }
     message Res {
@@ -93,6 +94,7 @@ message Transaction {
             PutRole.Res putRole_res = 11;
             PutRule.Res putRule_res = 12;
             ConceptMethod.Res conceptMethod_res = 13;
+            Explanation.Res explanation_res = 14;
         }
     }
 
@@ -244,11 +246,4 @@ message Transaction {
             Method.Res response = 1;
         }
     }
-
-    message ExplanationMethod {
-        message Req {
-            string id = 1;
-            Explanation.Req = 2;
-        }
-    }
 }
\ No newline at end of file

From c26d453d83baf0f2da2782bf0db0c931b0177629 Mon Sep 17 00:00:00 2001
From: Joshua Send <joshuasend1@gmail.com>
Date: Mon, 28 Oct 2019 18:40:03 +0000
Subject: [PATCH 3/3] Move to non-streamed explanations

---
 session/Answer.proto  | 17 ++++-------------
 session/Session.proto |  1 -
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/session/Answer.proto b/session/Answer.proto
index 505163aa..1f169dc4 100644
--- a/session/Answer.proto
+++ b/session/Answer.proto
@@ -37,22 +37,12 @@ message Answer {
     }
 }
 
-message Cause {
-    string pattern = 1;
-}
-
 message Explanation {
     message Req {
-        ConceptMap answer = 1;
+        ConceptMap explainable = 1;
     }
     message Res {
-        int32 iter_id = 1;
-        ConceptMap conceptMap = 2;
-    }
-    message Iter {
-        message Res {
-            ConceptMap conceptMap = 1;
-        }
+        repeated ConceptMap explanation = 1;
     }
 }
 
@@ -63,7 +53,8 @@ message AnswerGroup {
 
 message ConceptMap {
     map<string, Concept> map = 1;
-    Cause cause = 2;
+    string pattern = 2;
+    bool hasExplanation = 3;
 }
 
 message ConceptList {
diff --git a/session/Session.proto b/session/Session.proto
index 019d2599..d0a1fb91 100644
--- a/session/Session.proto
+++ b/session/Session.proto
@@ -108,7 +108,6 @@ message Transaction {
                 Query.Iter.Res query_iter_res = 2;
                 GetAttributes.Iter.Res getAttributes_iter_res = 3;
                 Method.Iter.Res conceptMethod_iter_res = 4;
-                Explanation.Iter.Res explanation_iter_res = 5;
             }
         }
     }