Merge branch 'main' of https://github.com/diffgram/python-sdk into schema

Author: vitalii-bulyzhyn

Diff for: sdk/diffgram/core/diffgram_dataset_iterator.py

@@ -187,13 +187,24 @@ def gen_tag_instances(self, instance_list):
             result.append(elm)
         return result
 
-    def get_file_instances(self, diffgram_file):
-        sample = {'diffgram_file': diffgram_file}
+    def get_file_instances(self, diffgram_file) -> dict:
+        if not diffgram_file:
+            return
+        sample = {'diffgram_file': diffgram_file, 'type': diffgram_file.type}
         if diffgram_file.type not in ['image', 'frame', 'compound']:
             logging.warning('File type "{}" is not supported yet'.format(diffgram_file.type))
             return sample
         if diffgram_file.type in ['image', 'frame']:
             sample['image'] = self.get_image_data(diffgram_file)
+        elif diffgram_file.type  is not None and diffgram_file.type.startswith('compound'):
+            from diffgram.file.compound_file import CompoundFile
+            compound_file: CompoundFile = diffgram_file
+            sample['children'] = []
+            child_files = compound_file.fetch_child_files(with_instances = True)
+            print('chsad', child_files)
+            for child in child_files:
+                result = self.get_file_instances(child)
+                sample['children'].append(result)
         instance_list = diffgram_file.instance_list
         instance_types_in_file = set([x['type'] for x in instance_list])
         # Process the instances of each file

Diff for: sdk/diffgram/core/directory.py

@@ -119,7 +119,7 @@ def all_file_ids(self, query = None):
             page_num = page_num,
             file_view_mode = 'ids_only',
             query = query,
-            with_children_files = True)
+            with_children_files = False)
 
         if diffgram_ids is False:
             raise Exception('Error Fetching Files: Please check you are providing a valid query.')

Diff for: sdk/diffgram/file/compound_file.py

@@ -109,31 +109,33 @@ class CompoundFile:
     child_files: List[CompoundChildFile]
     instance_list: List[dict]
 
-    def __init__(self, project: Project, name: str, directory_id: int, instance_list: List[dict] = []):
+    def __init__(self, project: Project, name: str, directory_id: int, instance_list: List[dict] = [], file_type: str = 'compound'):
         self.project = project
         self.name = name
         self.directory_id = directory_id
         self.child_files = []
         self.instance_list = instance_list
+        self.type = file_type
 
     @staticmethod
     def from_dict(project: Project, dir_id: int, dict_data: dict):
         result = CompoundFile(project = project, name = dict_data.get('original_filename'), directory_id = dir_id)
         result.__refresh_compound_file_from_data_dict(data = dict_data)
-        child_files = result.__fetch_child_files()
+        child_files = result.fetch_child_files()
         result.child_files = child_files
         return result
 
-    def __fetch_child_files(self) -> List[CompoundChildFile]:
+    def fetch_child_files(self, with_instances: bool = False) -> List[CompoundChildFile]:
         client = self.project
         endpoint = f"/api/v1/project/{self.project.project_string_id}/file/{self.id}/child-files"
 
-        response = client.session.get(client.host + endpoint)
+        response = client.session.get(client.host + endpoint, params = {'with_instances': with_instances})
 
         client.handle_errors(response)
 
         data = response.json()
         child_files_data = data['child_files']
+        print('child_files_data', child_files_data)
         result = []
         for elm in child_files_data:
             child_file = CompoundChildFile(root_file = self, child_file_type = elm.get('type'))
@@ -165,7 +167,8 @@ def __create_compound_parent_file(self):
         data = {
             'name': self.name,
             'directory_id': self.directory_id,
-            'instance_list': self.instance_list
+            'instance_list': self.instance_list,
+            'type': self.type
         }
         response = self.project.session.post(url = self.project.host + url,
                                              json = data)

Diff for: sdk/diffgram/file/file.py

@@ -1,5 +1,6 @@
 from ..regular.regular import refresh_from_dict
 
+
 class File():
     """
     file literal object
@@ -36,7 +37,7 @@ def new(
 
         """
 
-        file = File(client=client)
+        file = File(client = client)
         refresh_from_dict(file, file_json)
         return file
 
@@ -65,9 +66,9 @@ def update(
         if overwrite:
             packet['mode'] = "update_with_existing"
 
-        self.client.file.from_packet(packet=packet)
+        self.client.file.from_packet(packet = packet)
 
-    def copy(self, destination_dir, copy_instances=False):
+    def copy(self, destination_dir, copy_instances = False):
         payload = {
             'mode': 'TRANSFER',
             'file_list': [
@@ -88,17 +89,13 @@ def copy(self, destination_dir, copy_instances=False):
 
         response = self.client.session.post(
             self.client.host + endpoint,
-            json=payload)
+            json = payload)
 
         self.client.handle_errors(response)
 
         data = response.json()
         new_file_data = data['log']['info']['new_file'][0]
 
         return File.new(
-            client=self.client,
-            file_json=new_file_data)
-
-
-
-
+            client = self.client,
+            file_json = new_file_data)