Fully working version.

Author: DocGarbanzo

donkeycar/management/kivy_ui.py

@@ -12,6 +12,7 @@
 from kivy.core.image import Image as CoreImage
 from kivy.properties import NumericProperty, ObjectProperty, StringProperty, \
     ListProperty, BooleanProperty
+from kivy.uix.label import Label
 from kivy.uix.popup import Popup
 from kivy.lang.builder import Builder
 from kivy.core.window import Window
@@ -109,7 +110,7 @@ def load_action(self):
             try:
                 self.config = load_config(os.path.join(self.file_path, 'config.py'))
                 rc_handler.data['car_dir'] = self.file_path
-                train_screen().config = self.config
+                # train_screen().config = self.config
             except FileNotFoundError:
                 print(f'Directory {self.file_path} has no config.py')
             except Exception as e:
@@ -604,6 +605,11 @@ def on_keyboard(self, instance, keycode, scancode, key, modifiers):
 class ScrollableLabel(ScrollView):
     pass
 
+
+class DataFrameLabel(Label):
+    pass
+
+
 class TrainScreen(Screen):
     config = ObjectProperty(force_dispatch=True, allownone=True)
 
@@ -640,17 +646,29 @@ def value_list(self):
             return ['select']
 
     def on_config(self, obj, config):
-        if self.ids:
+        if self.config and self.ids:
             self.ids.cfg_spinner.values = self.value_list()
-            self.ids.scroll.text = self.get_database_text()
+            if self.ids.check.state == 'down':
+                text_df, text_tub = self.toggle_tub_df()
+                self.ids.scroll_pilots.text = text_df
+                self.ids.scroll_tubs.text = text_tub
+            else:
+                self.ids.scroll_pilots.text = self.get_database_text()
+                self.ids.scroll_tubs.text = ''
 
     def get_database_text(self):
         if self.config:
             database = PilotDatabase(self.config)
             df = database.to_df()
-            return str(df)
-        else:
-            return ''
+            df.drop(columns='History', inplace=True)
+            return df.to_string()
+
+    def toggle_tub_df(self):
+        if self.config:
+            database = PilotDatabase(self.config)
+            df, df_tub = database.to_df_tubgrouped()
+            df.drop(columns='History', inplace=True)
+            return df.to_string(), df_tub.to_string()
 
 
 class DonkeyApp(App):

donkeycar/management/ui.kv

@@ -214,7 +214,7 @@
     Button:
         text: 'Reload Tub'
         on_press:
-            app.tub_screen.ids.tub_loader.update_tub(reload=True)
+            app.tub_screen.ids.tub_loader.update_tub()
 
 <TubFilter>:
     id: tub_filter
@@ -420,6 +420,13 @@
         StatusLabel:
             id: status
 
+<DataframeLabel>:
+    font_name: 'data/fonts/RobotoMono-Regular.ttf'
+    font_size: 24
+    size_hint_y: None
+    height: self.texture_size[1]
+    text_size: self.width, None
+
 
 <TrainScreen>:
     config: app.tub_screen.ids.config_manager.config
@@ -466,26 +473,32 @@
                 text: 'Set model type'
             MySpinner:
                 id: train_spinner
+                size_hint_x: 0.5
                 text: 'linear'
                 values: ['linear', 'categorical', 'tflite_linear']
             TextInput:
                 id: comment
                 multiline: False
                 text: 'Comment'
-        Button:
-            id: train_button
-            text: 'Train'
-            on_press: root.train(train_spinner.text)
-        ScrollableLabel:
+            Button:
+                id: train_button
+                text: 'Train'
+                on_press: root.train(train_spinner.text)
+        BoxLayout:
+            size_hint_y: None
+            height: common_height
             Label:
-                id: scroll
-                size_hint_y: None
-                height: self.texture_size[1]
-                text_size: self.width, None
-        Label:
-            text: 'More stuff here'
-            size_hint_y: 5
-
+                text: 'Group multiple tubs'
+            ToggleButton:
+                id: check
+                on_press: root.on_config(None, None)
+                text: 'On' if self.state == 'down' else 'Off'
+        ScrollableLabel:
+            DataFrameLabel:
+                id: scroll_pilots
+        ScrollableLabel:
+            DataFrameLabel:
+                id: scroll_tubs
         StatusLabel:
             id: status
 

donkeycar/pipeline/training.py

@@ -78,8 +78,9 @@ def create_tf_data(self) -> tf.data.Dataset:
         return dataset.repeat().batch(self.batch_size)
 
 
-def get_model_train_details(cfg: Config, database: PilotDatabase, model: str,
-                            model_type: str) -> Tuple[str, int, str, bool]:
+def get_model_train_details(cfg: Config, database: PilotDatabase,
+                            model: str = None, model_type: str = None) \
+        -> Tuple[str, int, str, bool]:
     if not model_type:
         model_type = cfg.DEFAULT_MODEL_TYPE
     train_type = model_type
@@ -97,8 +98,9 @@ def get_model_train_details(cfg: Config, database: PilotDatabase, model: str,
     return model_name, model_num, train_type, is_tflite
 
 
-def train(cfg: Config, tub_paths: str, model: str, model_type: str,
-          transfer: str, comment: str = None) -> tf.keras.callbacks.History:
+def train(cfg: Config, tub_paths: str, model: str = None,
+          model_type: str = None, transfer: str = None, comment: str = None) \
+        -> tf.keras.callbacks.History:
     """
     Train the model
     """
@@ -155,7 +157,7 @@ def train(cfg: Config, tub_paths: str, model: str, model_type: str,
         'Tubs': tub_paths,
         'Time': time(),
         'History': history.history,
-        'Transfer': transfer,
+        'Transfer': os.path.basename(transfer) if transfer else None,
         'Comment': comment,
     }
     database.add_entry(database_entry)