Fix init bug - this was preventing to_tensorflow() from working

init_file_ids asumes the id was already set
but for now refresh_from_dict pattern means the id is set after init
so refactor `init_files()` and call it after...

We will need to work on this more

Luckily at least now it's refactored to `convert_json_to_sdk_object()` so we have it only in one place

Author: anthony-chaudhary

sdk/diffgram/core/core.py

@@ -28,7 +28,7 @@ def __init__(
             debug = False,
             staging = False,
             host = None,
-            set_default_directory = True,
+            init_default_directory = True,
             refresh_local_label_dict = True
 
     ):
@@ -71,7 +71,7 @@ def __init__(
         self.name_to_file_id = None
 
 
-        if set_default_directory is True:
+        if init_default_directory is True:
             self.set_default_directory()
             print("Default directory set:", self.directory_id)
 
@@ -83,7 +83,7 @@ def __init__(
 
         self.label_schema_list = self.get_label_schema_list()
 
-        self.directory_list = []
+        self.directory_list = None
 
 
     def get_member_list(self):
@@ -302,14 +302,14 @@ def set_default_directory(self,
         -> Sets the headers of self.session
 
         """
-
         if directory_id:
             self.directory_id = directory_id
         if directory:
             self.directory_id = directory.id
             self.default_directory = directory
-              
-        self.directory_list = self.directory.get_directory_list()
+            
+        if not self.directory_list:
+            self.directory_list = self.directory.get_directory_list()
 
         self.session.headers.update(
             {'directory_id': str(self.directory_id)})

sdk/diffgram/core/directory.py

@@ -18,14 +18,18 @@ def __init__(self,
         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()
+            self.init_files()
         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 init_files(self):
+        self.file_id_list = self.all_file_ids()
+
     def get_directory_list(self):
         """
         Get a list of available directories for a project
@@ -68,16 +72,15 @@ def convert_json_to_sdk_object(self, directory_list_json):
                 init_file_ids = False,
                 validate_ids = False
                 )
-            refresh_from_dict(new_directory, directory_json) 
-            directory_list.append(new_directory)
+            refresh_from_dict(new_directory, directory_json)
 
-        return directory_list
+            # note timing issue, this needs to happen after id is refreshed
+            new_directory.init_files()  
 
+            directory_list.append(new_directory)
 
-    def set_default():
+        return directory_list
 
-        if not self.client.directory_list:
-            self.client.directory_list = self.get_directory_list()
 
 
     def all_files(self):
@@ -89,7 +92,10 @@ def all_files(self):
         page_num = 1
         result = []
         while page_num is not None:
-            diffgram_files = self.list_files(limit = 1000, page_num = page_num, file_view_mode = 'base')
+            diffgram_files = self.list_files(
+                limit = 1000, 
+                page_num = page_num, 
+                file_view_mode = 'base')
             page_num = self.file_list_metadata['next_page']
             result = result + diffgram_files
         return result
@@ -98,7 +104,12 @@ def all_file_ids(self, query = None):
         page_num = 1
         result = []
 
-        diffgram_ids = self.list_files(limit = 5000, page_num = page_num, file_view_mode = 'ids_only', query = query)
+        diffgram_ids = self.list_files(
+            limit = 5000, 
+            page_num = page_num, 
+            file_view_mode = 'ids_only', 
+            query = query)
+
         if diffgram_ids is False:
             raise Exception('Error Fetching Files: Please check you are providing a valid query.')
         result = result + diffgram_ids
@@ -223,22 +234,6 @@ def list_files(
             file_view_mode: str = 'annotation',
             query: str = None):
         """
-        Get a list of files in directory (from Diffgram service).
-
-        Assumes we are using the default directory.
-        this can be changed ie by: 	project.set_directory_by_name(dir_name)
-
-        We don't have a strong Directory concept in the SDK yet
-        So for now assume that we need to
-        call 	project.set_directory_by_name(dir_name)   first
-        if we want to change the directory
-
-
-        WIP Feb 3, 2020
-            A lot of "hard coded" options here.
-            Want to think a bit more about what we want to
-            expose options here and what good contexts are.
-
         """
         if self.id:
             logging.info("Using Dataset ID " + str(self.id))