Update ecoset.py

ecoset.py

@@ -118,7 +118,7 @@ class Ecoset(datasets.GeneratorBasedBuilder):
         
         def abslist(path):
             """Helper function to give abspaths of os.listdir"""
-            return [op.join(path, p) for p in os.listdir(path)]
+            return [os.path.join(path, p) for p in os.listdir(path)if os.path.isdir(os.path.join(path, p))]
             
         def subprocess_call_print(command_list):
             """Execute a subprocess while printing the command line output"""
@@ -151,18 +151,18 @@ class Ecoset(datasets.GeneratorBasedBuilder):
             zip_file_path = os.path.join(target_dir, filename)
 
             # Use subprocess to execute the modified wget command.
-            wget_command = f"wget --no-check-certificate {source_url} -O {zip_file_path}"
-            subprocess.run(wget_command, shell=True) 
+            #wget_command = f"wget --no-check-certificate {source_url} -O {zip_file_path}"
+            #subprocess.run(wget_command, shell=True) 
             
             
             print(f"Downloaded {filename}")
             # unzip using platform-based subprocess
-            if platform.system() in ("Linux", "Darwin"):
-                #subprocess.call(["unzip", "-n", "-P", password.encode("ascii"), "-o", zip_path, "-d", target_dir], shell=False)
-                subprocess_call_print(["unzip", "-n", "-P", password.encode("ascii"), "-o", zip_file_path, "-d", target_dir])
-            else:
-                #subprocess.call(["tar.exe", "-xf", zip_path, "-C", target_dir, "--passphrase", password], shell=False)
-                subprocess_call_print(["tar.exe", "-xf", zip_file_path, "-C", target_dir, "--passphrase", password])
+            #if platform.system() in ("Linux", "Darwin"):
+                
+                #subprocess_call_print(["unzip", "-n", "-P", password.encode("ascii"), "-o", zip_file_path, "-d", target_dir])
+            #else:
+                
+                #subprocess_call_print(["tar.exe", "-xf", zip_file_path, "-C", target_dir, "--passphrase", password])
 
 
      
@@ -174,10 +174,12 @@ class Ecoset(datasets.GeneratorBasedBuilder):
         # create a dict containing all files
         split_dict = {split:[] for split in ("train", "val", "test")}
         for split in split_dict.keys():
-            fnames = abslist(op.join(archives, split))
-            for f in fnames:
-                split_dict[split].extend(abslist(f))
-        
+            # Get a list of file names in the current split's directory
+            fnames = abslist(os.path.join(archives, split))
+            
+            # Extend the corresponding split's list in split_dict with the file names
+            split_dict[split].extend(fnames)
+                
         # return data splits
         return [datasets.SplitGenerator(
                 name=datasets.Split.TRAIN,
@@ -206,13 +208,19 @@ class Ecoset(datasets.GeneratorBasedBuilder):
     def _generate_examples(self, archives, split):
         """Yields examples."""
         idx = 0
-        for archive in archives:
-            if any(archive.endswith(i) for i in (".JPEG", ".JPG", ".jpeg", ".jpg")):
-                
+        split_archives = os.path.join(archives, split)
+        print(split_archives)
+        acceptable_formats = [".JPEG", ".JPG", ".jpeg", ".jpg"]
+        for archive in os.listdir(split_archives):
+            print(archive)
+            if any(archive.endswith(f) for f in acceptable_formats):
+                print('in')
                 # extract file, label, etc
-                file = open(archive, 'rb')
-                synset_id, label = archive.split("/")[-2].split("_")
-                ex = {"image": {"path": archive, "bytes": file.read()}, "label": label}
-                
-                yield idx, ex
-                idx += 1
+                file_path = os.path.join(split_archives, archive)
+                with open(file_path, 'rb') as file:
+                    synset_id, label = archive.rsplit(os.path.sep, 2)[-2].split("_")
+                    
+                    ex = {"image": {"path": archive, "bytes": file.read()}, "label": label}
+                    print(ex)
+                    yield idx, ex
+                    idx += 1