Merge branch 'main' into docs_tweaks_2

activeloopai · Apr 2, 2024 · 4def757 · 4def757
2 parents 93d5e24 + f657422
commit 4def757
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/deeplake/core/dataset/dataset.py b/deeplake/core/dataset/dataset.py
@@ -2242,7 +2242,7 @@ def dataloader(self, ignore_errors: bool = False, verbose: bool = False):
             ...     pass
 
         """
-        from deeplake.enterprise import dataloader
+        from deeplake.enterprise.dataloader import dataloader
 
         deeplake_reporter.feature_report(feature_name="dataloader", parameters={})
 

diff --git a/deeplake/core/dataset/deeplake_query_dataset.py b/deeplake/core/dataset/deeplake_query_dataset.py
@@ -233,14 +233,14 @@ def __len__(self):
 
     @deeplake_reporter.record_call
     def dataloader(self, ignore_errors: bool = False, verbose: bool = False):
-        """Returns a :class:`~deeplake.enterprise.DeepLakeDataLoader` object.
+        """Returns a :class:`~deeplake.enterprise.dataloader.DeepLakeDataLoader` object.
 
         Args:
             ignore_errors (bool): If ``True``, the data loader will ignore errors appeared during data iteration otherwise it will collect the statistics and report appeared errors. Default value is ``False``
             verbose (bool): If ``True``, the data loader will dump verbose logs of it's steps. Default value is ``False``
 
         Returns:
-            ~deeplake.enterprise.DeepLakeDataLoader: A :class:`deeplake.enterprise.DeepLakeDataLoader` object.
+            ~deeplake.enterprise.dataloader.DeepLakeDataLoader: A :class:`deeplake.enterprise.dataloader.DeepLakeDataLoader` object.
         
         Examples:
 
@@ -300,7 +300,7 @@ def dataloader(self, ignore_errors: bool = False, verbose: bool = False):
         - Users of our Community plan can create dataloaders on Activeloop datasets ("hub://activeloop/..." datasets).
         - To run queries on your own datasets, `upgrade your organization's plan <https://www.activeloop.ai/pricing/>`_.
         """
-        from deeplake.enterprise import DeepLakeDataLoader
+        from deeplake.enterprise.dataloader import DeepLakeDataLoader
 
         dataloader = DeepLakeDataLoader(
             self,

diff --git a/deeplake/enterprise/__init__.py b/deeplake/enterprise/__init__.py
@@ -1,6 +1,2 @@
-try:
-    from deeplake.enterprise.dataloader import dataloader, DeepLakeDataLoader
-except ImportError:
-    pass
 from deeplake.enterprise.libdeeplake_query import query, sample_by
 from deeplake.enterprise.convert_to_libdeeplake import dataset_to_libdeeplake
diff --git a/deeplake/enterprise/dataloader.py b/deeplake/enterprise/dataloader.py
@@ -909,7 +909,7 @@ def dataloader(
 
 
         >>> import deeplake
-        >>> from deeplake.enterprise import dataloader
+        >>> from deeplake.enterprise.dataloader import dataloader
         >>>
         >>> ds_train = deeplake.load('hub://activeloop/fashion-mnist-train')
         >>> train_loader = dataloader(ds_train).numpy()

diff --git a/deeplake/requirements/common.txt b/deeplake/requirements/common.txt
@@ -1,5 +1,5 @@
 numpy
-pillow
+pillow~=10.2.0
 boto3
 click
 google-cloud-storage~=1.42.0