Merge branch 'main' of github.com:activeloopai/deeplake into managed-…

…thin-client

README.md

@@ -234,11 +234,7 @@ If you're a dataset owner and do not want your dataset to be included in this li
 <details>
   <summary><b> Usage Tracking</b></summary>
 
-By default, we collect usage data using Bugout (here's the [code](https://github.com/activeloopai/deeplake/blob/853456a314b4fb5623c936c825601097b0685119/deeplake/__init__.py#L24) that does it). It does not collect user data other than anonymized IP address data, and it only logs the Deep Lake library's own actions. This helps our team understand how the tool is used and how to build features that matter to you! After you register with Activeloop, data is no longer anonymous. You can always opt-out of reporting using the CLI command below, or by setting an environmental variable ```BUGGER_OFF``` to ```True```:
-
-```bash
-activeloop reporting --off
-```
+By default, we collect usage data using Bugout (here's the [code](https://github.com/activeloopai/deeplake/blob/853456a314b4fb5623c936c825601097b0685119/deeplake/__init__.py#L24) that does it). It does not collect user data other than anonymized IP address data, and it only logs the Deep Lake library's own actions. This helps our team understand how the tool is used and how to build features that matter to you! After you register with Activeloop, data is no longer anonymous. You can always opt-out of reporting by setting an environmental variable ```BUGGER_OFF``` to ```True```:
 
 </details>
 

deeplake/__init__.py

@@ -89,7 +89,7 @@
 ]
 
 
-__version__ = "3.8.19"
+__version__ = "3.8.20"
 warn_if_update_required(__version__)
 __encoded_version__ = np.array(__version__)
 config = {"s3": Config(max_pool_connections=50, connect_timeout=300, read_timeout=300)}

deeplake/api/tests/test_agreement.py

@@ -3,7 +3,6 @@
 import pytest
 from io import StringIO
 from contextlib import contextmanager
-from deeplake.cli.auth import login, logout
 from deeplake.client.client import DeepLakeBackendClient
 from deeplake.util.exceptions import (
     AgreementNotAcceptedError,

deeplake/api/tests/test_api.py

@@ -48,11 +48,8 @@
 from deeplake.util.pretty_print import summary_tensor, summary_dataset
 from deeplake.util.shape_interval import ShapeInterval
 from deeplake.constants import GDRIVE_OPT, MB, KB
-from deeplake.client.config import REPORTING_CONFIG_FILE_PATH
 
 from click.testing import CliRunner
-from deeplake.cli.auth import login, logout
-from deeplake.util.bugout_reporter import feature_report_path
 from rich import print as rich_print
 from io import BytesIO
 
@@ -2350,13 +2347,6 @@ def user_not_logged_in_exception_check(runner):
         ds = deeplake.empty("hub://adilkhan/demo")
 
 
-def dataset_handler_error_check(runner, username, password):
-    result = runner.invoke(login, f"-u {username} -p {password}")
-    with pytest.raises(DatasetHandlerError):
-        ds = deeplake.load(f"hub://{username}/wrong-path")
-    runner.invoke(logout)
-
-
 def test_incompat_dtype_msg(local_ds, capsys):
     local_ds.create_tensor("abc", dtype="uint32")
     with pytest.raises(SampleAppendError):

deeplake/api/tests/test_dataset.py

@@ -1,7 +1,6 @@
 import jwt
 
 from deeplake.util.exceptions import DatasetHandlerError, UserNotLoggedInException
-from deeplake.cli.auth import login, logout
 from click.testing import CliRunner
 import pytest
 import deeplake

deeplake/api/tests/test_views.py

@@ -1,7 +1,4 @@
 from deeplake.util.exceptions import ReadOnlyModeError, EmptyTensorError, TransformError
-from deeplake.client.utils import get_user_name
-from deeplake.cli.auth import logout, login
-from click.testing import CliRunner
 
 import numpy as np
 
@@ -27,10 +24,6 @@ def populate(ds):
 def test_view_token_only(
     hub_cloud_path, hub_cloud_dev_token, hub_cloud_dev_credentials
 ):
-    runner = CliRunner()
-    result = runner.invoke(logout)
-    assert result.exit_code == 0
-
     ds = deeplake.empty(hub_cloud_path, token=hub_cloud_dev_token)
     with ds:
         populate(ds)
@@ -60,29 +53,19 @@ def test_view_token_only(
 
 
 @pytest.mark.slow
-def test_view_public(hub_cloud_dev_credentials):
-    runner = CliRunner()
-    result = runner.invoke(logout)
-    assert result.exit_code == 0
-
-    username, password = hub_cloud_dev_credentials
-
+def test_view_public(hub_cloud_dev_token):
     ds = deeplake.load("hub://activeloop/mnist-train")
     view = ds[100:200]
 
     with pytest.raises(ReadOnlyModeError):
         view.save_view(id="100to200")
 
-    runner.invoke(login, f"-u {username} -p {password}")
-
-    ds = deeplake.load("hub://activeloop/mnist-train")
+    ds = deeplake.load("hub://activeloop/mnist-train", token=hub_cloud_dev_token)
     view = ds[100:200]
 
     with pytest.raises(ReadOnlyModeError):
         view.save_view(id="100to200")
 
-    runner.invoke(logout)
-
 
 def test_view_with_empty_tensor(local_ds):
     with local_ds as ds:

deeplake/client/test_client.py

@@ -1,6 +1,4 @@
 import pytest
-from deeplake.cli.commands import login, logout
-from click.testing import CliRunner
 from deeplake.client.client import (
     DeepLakeBackendClient,
     DeepMemoryBackendClient,

deeplake/core/vectorstore/test_deeplake_vectorstore.py

@@ -34,9 +34,6 @@
     METRIC_TO_INDEX_METRIC,
 )
 from deeplake.core.vectorstore.vector_search import dataset as dataset_utils
-from deeplake.cli.auth import login, logout
-from click.testing import CliRunner
-
 
 EMBEDDING_DIM = 100
 NUMBER_OF_DATA = 10

deeplake/core/vectorstore/vector_search/utils.py

@@ -176,10 +176,6 @@ def create_tensor_to_length_str(tensors):
     return tensor_lengths
 
 
-random.seed(0)
-np.random.seed(0)
-
-
 def generate_random_string(length):
     # Define the character set to include letters (both lowercase and uppercase) and digits
     characters = string.ascii_letters + string.digits

deeplake/enterprise/test_query.py

@@ -2,8 +2,6 @@
 from math import floor
 
 import deeplake
-from click.testing import CliRunner
-from deeplake.cli.auth import login, logout
 from deeplake.constants import QUERY_MESSAGE_MAX_SIZE
 from deeplake.tests.common import requires_libdeeplake
 from deeplake.util.exceptions import EmptyTokenException

deeplake/util/storage.py

@@ -62,7 +62,9 @@ def storage_provider_from_path(
             creds_used = "PLATFORM"
             if creds == "ENV":
                 creds_used = "ENV"
-            elif isinstance(creds, dict) and set(creds.keys()) == {"profile_name"}:
+            elif isinstance(creds, dict) and (
+                set(creds.keys()) == {"profile_name"} or not bool(creds)
+            ):
                 creds_used = "ENV"
             elif isinstance(creds, dict) and bool(creds):
                 creds_used = "DICT"

setup.py

@@ -70,7 +70,7 @@ def libdeeplake_available():
 extras_require["all"] = [req_map[r] for r in all_extras]
 
 if libdeeplake_available():
-    libdeeplake = "libdeeplake==0.0.98"
+    libdeeplake = "libdeeplake==0.0.99"
     extras_require["enterprise"] = [libdeeplake, "pyjwt"]
     extras_require["all"].append(libdeeplake)
     install_requires.append(libdeeplake)
@@ -101,7 +101,7 @@ def get_property(prop):
     "tests_require": tests,
     "include_package_data": True,
     "zip_safe": False,
-    "entry_points": {"console_scripts": ["activeloop = deeplake.cli.commands:cli"]},
+    "entry_points": {},
     "dependency_links": [],
     "project_urls": {
         "Documentation": "https://docs.activeloop.ai/",