Use builder pattern for identities

cli/ops/jupyter.rs

@@ -60,7 +60,8 @@ pub async fn op_jupyter_input(
     }
 
     last_request
-      .new_message_with_identities("input_request")
+      .new_message("input_request")
+      .with_identities(&last_request)
       .with_content(json!({
         "prompt": prompt,
         "password": is_password,

cli/tools/jupyter/jupyter_msg.rs

@@ -206,28 +206,6 @@ impl JupyterMessage {
     }
   }
 
-  // TODO: extend ::new_message to optionally clone zmq identities?
-  // Creates a new child message of this message. ZMQ identities are transferred.
-  // Necessary for `input_request` to match the zmq identities or the frontend will
-  // not receive the message.
-  pub(crate) fn new_message_with_identities(&self, msg_type: &str) -> JupyterMessage {
-    let mut header = self.header.clone();
-    header["msg_type"] = serde_json::Value::String(msg_type.to_owned());
-    header["username"] = serde_json::Value::String("kernel".to_owned());
-    header["msg_id"] = serde_json::Value::String(Uuid::new_v4().to_string());
-    header["date"] = serde_json::Value::String(utc_now().to_rfc3339());
-
-
-    JupyterMessage {
-      zmq_identities: self.zmq_identities.clone(),
-      header,
-      parent_header: self.header.clone(),
-      metadata: json!({}),
-      content: json!({}),
-      buffers: vec![],
-    }
-  }
-
   // Creates a reply to this message. This is a child with the message type determined
   // automatically by replacing "request" with "reply". ZMQ identities are transferred.
   pub(crate) fn new_reply(&self) -> JupyterMessage {
@@ -265,6 +243,14 @@ impl JupyterMessage {
     self
   }
 
+  pub(crate) fn with_identities(
+    mut self,
+    msg: &JupyterMessage,
+  ) -> JupyterMessage {
+    self.zmq_identities = msg.zmq_identities.clone();
+    self
+  }
+
   pub(crate) async fn send<S: zeromq::SocketSend>(
     &self,
     connection: &mut Connection<S>,