pass hive location from client (#90)

* pass hive location from client

* fix message display

Author: typhoonzero

proto/sqlflow/proto/sqlflow.proto

@@ -24,6 +24,9 @@ message Session {
     string db_conn_str = 2;
     bool exit_on_submit = 3;
     string user_id = 4;
+    // for loading CSV to hive
+    string hive_location = 5;
+    string hdfs_namenode_addr = 6;
 }
 
 // SQL statements to run

sqlflow/client.py

@@ -67,11 +67,18 @@ def sql_request(self, sql):
         db_conn_str = os.getenv("SQLFLOW_DATASOURCE", "")
         exit_on_submit_env = os.getenv("SQLFLOW_EXIT_ON_SUBMIT", "True")
         user_id = os.getenv("SQLFLOW_USER_ID", "")
+        hive_location = os.getenv("SQLFLOW_HIVE_LOCATION", "")
+        hdfs_namenode_addr = os.getenv("SQLFLOW_HDFS_NAMENODE_ADDR", "")
         if exit_on_submit_env.isdigit():
             exit_on_submit = bool(int(exit_on_submit_env))
         else:
             exit_on_submit = exit_on_submit_env.lower() == "true"
-        se = pb.Session(token=token, db_conn_str=db_conn_str, exit_on_submit=exit_on_submit, user_id=user_id)
+        se = pb.Session(token=token,
+                        db_conn_str=db_conn_str,
+                        exit_on_submit=exit_on_submit,
+                        user_id=user_id,
+                        hive_location=hive_location,
+                        hdfs_namenode_addr=hdfs_namenode_addr)
         try:
             sql = self._expander.expand(sql)
         except Exception as e:
@@ -127,13 +134,15 @@ def display(cls, stream_response):
                 else:
                     all_messages = []
                     all_messages.append(first.message.message)
+                    eoe = None
                     for res in stream_response:
                         if res.WhichOneof('response') == 'eoe':
                             _LOGGER.info("end execute %s, spent: %d" % (res.eoe.sql, res.eoe.spent_time_seconds))
-                            compound_message.add_message('\n'.join(all_messages), res)
+                            eoe = res
                             break
                         _LOGGER.debug(res.message.message)
                         all_messages.append(res.message.message)
+                    compound_message.add_message('\n'.join(all_messages), eoe)
             else:
                 column_names = [column_name for column_name in first.head.column_names]
                 def rows_gen():

sqlflow/compound_message.py

@@ -44,7 +44,7 @@ def _repr_html_(self):
             if isinstance(r[0], Rows):
                 all_html = ''.join([all_html, r[0]._repr_html_()])
             else:
-                all_html = ''.join([all_html, "<p>%s</p>" % (r[0].__str__())])
+                all_html = ''.join([all_html, "<p>%s</p>" % (r[0].__str__().replace("\n", "<br>"))])
         return all_html
 
     def get(self, idx):