run yapf on all files after merge

datmo/cli/command/snapshot.py

@@ -179,8 +179,11 @@ def ls(self, **kwargs):
                 "code id", "environment id", "file collection id"
             ]
             t = prettytable.PrettyTable(header_list)
-            snapshot_objs = self.snapshot_controller.list(session_id=session_id, visible=True,
-                                                          sort_key='created_at', sort_order='descending')
+            snapshot_objs = self.snapshot_controller.list(
+                session_id=session_id,
+                visible=True,
+                sort_key='created_at',
+                sort_order='descending')
             for snapshot_obj in snapshot_objs:
                 t.add_row([
                     snapshot_obj.id,

datmo/cli/command/task.py

@@ -108,7 +108,8 @@ def ls(self, **kwargs):
         # Get all snapshot meta information
         header_list = ["id", "command", "status", "gpu", "created at"]
         t = prettytable.PrettyTable(header_list)
-        task_objs = self.task_controller.list(session_id, sort_key='created_at', sort_order='descending')
+        task_objs = self.task_controller.list(
+            session_id, sort_key='created_at', sort_order='descending')
         for task_obj in task_objs:
             t.add_row([
                 task_obj.id, task_obj.command, task_obj.status, task_obj.gpu,

datmo/core/controller/session.py

@@ -84,7 +84,7 @@ def get_current(self):
             "current": True
         })
 
-    def list(self, query = {}, sort_key=None, sort_order=None):
+    def list(self, query={}, sort_key=None, sort_order=None):
         return self.dal.session.query(query, sort_key, sort_order)
 
     def delete_by_name(self, name):

datmo/core/controller/snapshot.py

@@ -252,7 +252,11 @@ def checkout(self, snapshot_id):
                                              abs_dst_dirpath)
         return True
 
-    def list(self, session_id=None, visible=None, sort_key=None, sort_order=None):
+    def list(self,
+             session_id=None,
+             visible=None,
+             sort_key=None,
+             sort_order=None):
         query = {}
         if session_id:
             try:

datmo/core/controller/tests/test_session.py

@@ -60,32 +60,38 @@ def test_get_current(self):
 
     def test_get_session_sort(self):
         # Sort ascending
-        sessions = self.session.list(sort_key='created_at', sort_order='ascending')
+        sessions = self.session.list(
+            sort_key='created_at', sort_order='ascending')
         assert sessions[0].created_at <= sessions[-1].created_at
 
         # Sort descending
-        sessions = self.session.list(sort_key='created_at', sort_order='descending')
+        sessions = self.session.list(
+            sort_key='created_at', sort_order='descending')
         assert sessions[0].created_at >= sessions[-1].created_at
 
         # Wrong order being passed in
         failed = False
         try:
-            _ = self.session.list(sort_key='created_at', sort_order='wrong_order')
+            _ = self.session.list(
+                sort_key='created_at', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
 
         # Wrong key and order being passed in
         failed = False
         try:
-            _ = self.session.list(sort_key='wrong_key', sort_order='wrong_order')
+            _ = self.session.list(
+                sort_key='wrong_key', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
 
         # wrong key and right order being passed in
-        expected_sessions = self.session.list(sort_key='created_at', sort_order='ascending')
-        sessions = self.session.list(sort_key='wrong_key', sort_order='ascending')
+        expected_sessions = self.session.list(
+            sort_key='created_at', sort_order='ascending')
+        sessions = self.session.list(
+            sort_key='wrong_key', sort_order='ascending')
         expected_ids = [item.id for item in expected_sessions]
         ids = [item.id for item in sessions]
         assert set(expected_ids) == set(ids)

datmo/core/controller/tests/test_snapshot.py

@@ -400,15 +400,17 @@ def test_list(self):
             snapshot_obj_2 in result
 
         # List all tasks regardless of filters in ascending
-        result = self.snapshot.list(sort_key='created_at', sort_order='ascending')
+        result = self.snapshot.list(
+            sort_key='created_at', sort_order='ascending')
 
         assert len(result) == 2 and \
                snapshot_obj_1 in result and \
                snapshot_obj_2 in result
         assert result[0].created_at <= result[-1].created_at
 
         # List all tasks regardless of filters in descending
-        result = self.snapshot.list(sort_key='created_at', sort_order='descending')
+        result = self.snapshot.list(
+            sort_key='created_at', sort_order='descending')
         assert len(result) == 2 and \
                snapshot_obj_1 in result and \
                snapshot_obj_2 in result
@@ -417,22 +419,26 @@ def test_list(self):
         # Wrong order being passed in
         failed = False
         try:
-            _ = self.snapshot.list(sort_key='created_at', sort_order='wrong_order')
+            _ = self.snapshot.list(
+                sort_key='created_at', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
 
         # Wrong key and order being passed in
         failed = False
         try:
-            _ = self.snapshot.list(sort_key='wrong_key', sort_order='wrong_order')
+            _ = self.snapshot.list(
+                sort_key='wrong_key', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
 
         # wrong key and right order being passed in
-        expected_result = self.snapshot.list(sort_key='created_at', sort_order='ascending')
-        result = self.snapshot.list(sort_key='wrong_key', sort_order='ascending')
+        expected_result = self.snapshot.list(
+            sort_key='created_at', sort_order='ascending')
+        result = self.snapshot.list(
+            sort_key='wrong_key', sort_order='ascending')
         expected_ids = [item.id for item in expected_result]
         ids = [item.id for item in result]
         assert set(expected_ids) == set(ids)

datmo/core/controller/tests/test_task.py

@@ -381,7 +381,8 @@ def test_list(self):
         assert failed
 
         # wrong key and right order being passed in
-        expected_result = self.task.list(sort_key='created_at', sort_order='ascending')
+        expected_result = self.task.list(
+            sort_key='created_at', sort_order='ascending')
         result = self.task.list(sort_key='wrong_key', sort_order='ascending')
         expected_ids = [item.id for item in expected_result]
         ids = [item.id for item in result]

datmo/core/storage/driver/blitzdb_dal_driver.py

@@ -111,23 +111,30 @@ def query(self, collection, query_params, sort_key=None, sort_order=None):
             del query_params['id']
         if sort_key is not None and sort_order is not None:
             if sort_order == 'ascending':
-                return list(map(normalize_entity, [item.attributes.copy()
-                                                   for item in self.backend.filter(collection,
-                                                                                   query_params).sort(sort_key,
-                                                                                                      queryset.QuerySet.ASCENDING)]))
+                return list(
+                    map(normalize_entity, [
+                        item.attributes.copy() for item in self.backend.filter(
+                            collection, query_params).sort(
+                                sort_key, queryset.QuerySet.ASCENDING)
+                    ]))
             elif sort_order == 'descending':
-                return list(map(normalize_entity, [item.attributes.copy()
-                                                   for item in self.backend.filter(collection,
-                                                                                   query_params).sort(sort_key,
-                                                                                                      queryset.QuerySet.DESCENDING)]))
+                return list(
+                    map(normalize_entity, [
+                        item.attributes.copy() for item in self.backend.filter(
+                            collection, query_params).sort(
+                                sort_key, queryset.QuerySet.DESCENDING)
+                    ]))
             else:
                 raise InvalidArgumentType()
         else:
             if sort_key is not None and sort_order is None or \
                 sort_key is None and sort_order is not None:
                 raise RequiredArgumentMissing()
-            return list(map(normalize_entity, [item.attributes.copy()
-                                               for item in self.backend.filter(collection, query_params)]))
+            return list(
+                map(normalize_entity, [
+                    item.attributes.copy()
+                    for item in self.backend.filter(collection, query_params)
+                ]))
 
     def delete(self, collection, entity_id):
         self.__reload()