Upgrade to use class object instead of json

-> Before we were using the json which introduced some potential confusion
now it uses the directory object
-> Move functions inside class
-> Move default setting inside here... the API returning default in that way still not best but working in existing pattern

Author: anthony-chaudhary

sdk/diffgram/core/directory.py

@@ -4,86 +4,81 @@
 from diffgram.core.diffgram_dataset_iterator import DiffgramDatasetIterator
 from multiprocessing.pool import ThreadPool as Pool
 
-def get_directory_list(self):
-    """
-    Get a list of available directories for a project
 
-    Arguments
-        self
-
-    Expects
-        self.project_string_id
-
-    Returns
-        directory_list, array of dicts
-
-    """
+class Directory(DiffgramDatasetIterator):
 
-    if self.project_string_id is None:
-        raise Exception("No project string." + \
-                        "Set a project string using .auth()")
+    def __init__(self, 
+                 client, 
+                 file_id_list_sliced = None, 
+                 init_file_ids = True, 
+                 validate_ids = True):
 
-    if type(self.project_string_id) != str:
-        raise Exception("project_string_id must be of type String")
+        self.client = client
+        self.id = None
+        self.file_list_metadata = {}
+        self.nickname = None
+        if file_id_list_sliced is None and init_file_ids:
+            self.file_id_list = self.all_file_ids()
+        elif not init_file_ids:
+            self.file_id_list = []
+        elif file_id_list_sliced is not None:
+            self.file_id_list = file_id_list_sliced
+        super(Directory, self).__init__(self.client, self.file_id_list, validate_ids)
 
-    endpoint = "/api/v1/project/" + self.project_string_id + \
-               "/directory/list"
 
-    response = self.session.get(self.host + endpoint)
+    def get_directory_list(self):
+        """
+        Get a list of available directories for a project
+        """
 
-    self.handle_errors(response)
+        if self.client.project_string_id is None:
+            raise Exception("No project string." + \
+                            "Set a project string using .auth()")
 
-    directory_list = response.json()
+        if type(self.client.project_string_id) != str:
+            raise Exception("project_string_id must be of type String")
 
-    return directory_list
+        endpoint = "/api/v1/project/" + self.client.project_string_id + \
+                   "/directory/list"
 
+        response = self.client.session.get(self.client.host + endpoint)
 
-def set_directory_by_name(self, name):
-    """
+        self.client.handle_errors(response)
 
-    Arguments
-        self
-        name, string
+        data = response.json()
+        
+        directory_list_json = data.get('directory_list')
+        default_directory_json = data.get('default_directory')
 
-    """
+        if default_directory_json:
+            self.client.directory_id = default_directory_json.get('id')
 
-    if name is None:
-        raise Exception("No name provided.")
+        directory_list = self.convert_json_to_sdk_object(directory_list_json)
 
-    # Don't refresh by default, just set from existing
+        return directory_list
+        
 
-    names_attempted = []
-    did_set = False
+    def convert_json_to_sdk_object(self, directory_list_json):
 
-    for directory in self.directory_list:
+        directory_list = []
 
-        nickname = directory.get("nickname")
-        if nickname == name:
-            self.set_default_directory(directory.get("id"))
-            did_set = True
-            break
-        else:
-            names_attempted.append(nickname)
+        for directory_json in directory_list_json:
+            new_directory = Directory(
+                client = self.client,
+                init_file_ids = False,
+                validate_ids = False
+                )
+            refresh_from_dict(new_directory, directory_json) 
+            directory_list.append(new_directory)
 
-    if did_set is False:
-        raise Exception(name, " does not exist. Valid names are: " +
-                        str(names_attempted))
+        return directory_list
 
 
-class Directory(DiffgramDatasetIterator):
+    def set_default():
 
-    def __init__(self, client, file_id_list_sliced = None, init_file_ids = True, validate_ids = True):
+        if not self.client.directory_list:
+            self.client.directory_list = self.get_directory_list()
 
-        self.client = client
-        self.id = None
-        self.file_list_metadata = {}
-        if file_id_list_sliced is None and init_file_ids:
-            self.file_id_list = self.all_file_ids()
-        elif not init_file_ids:
-            self.file_id_list = []
-        elif file_id_list_sliced is not None:
-            self.file_id_list = file_id_list_sliced
-        super(Directory, self).__init__(self.client, self.file_id_list, validate_ids)
 
     def all_files(self):
         """
@@ -190,7 +185,7 @@ def new(self, name: str):
         # generator expression returns True if the directory
         # is not found. this is a bit awkward.
         if next((dir for dir in self.client.directory_list
-                 if dir['nickname'] == name), True) is not True:
+                 if dir.nickname == name), True) is not True:
             raise Exception(name, "Already exists")
 
         packet = {'nickname': name}
@@ -208,18 +203,15 @@ def new(self, name: str):
 
         project = data.get('project')
         if project:
-            directory_list = project.get('directory_list')
-            # TODO upgrade directory_list here to be 1st class objects instead of JSON
-            if directory_list:
-                self.client.directory_list = directory_list
+            directory_list_json = project.get('directory_list')
+            if directory_list_json:
+                self.client.directory_list = self.convert_json_to_sdk_object(directory_list_json)
 
         new_directory = None
         # TODO the route about should return the newly created dataset directly
-        for directory_json in self.client.directory_list:
-            nickname = directory_json.get("nickname")
-            if nickname == name:
-                new_directory = Directory(client = self.client)
-                refresh_from_dict(new_directory, directory_json)
+        for directory in self.client.directory_list:
+            if directory.nickname == name:
+                new_directory = directory
 
         return new_directory
 
@@ -319,20 +311,16 @@ def get(self,
         names_attempted = []
         did_set = False
 
-        for directory_json in self.client.directory_list:
-
-            nickname = directory_json.get("nickname")
-            if nickname == name:
-                # TODO change the general directory_list
-                # to use object approach (over dict)
+        if not self.client.directory_list:
+            self.client.directory_list = self.get_directory_list()
 
-                new_directory = Directory(client = self.client)
-                refresh_from_dict(new_directory, directory_json)
+        for directory in self.client.directory_list:
 
-                return new_directory
+            if directory.nickname == name:
+                return directory
 
             else:
-                names_attempted.append(nickname)
+                names_attempted.append(directory.nickname)
 
         if did_set is False:
             raise Exception(name, " does not exist. Valid names are: " +