Make changes according to libtiledb

Author: kounelisagis

tiledb/libtiledb/profile.cc

@@ -20,6 +20,8 @@ void init_profile(py::module& m) {
             py::init<std::optional<std::string>, std::optional<std::string>>(),
             py::keep_alive<1, 2>())
 
+        .def(py::init<Profile>())
+
         .def_property_readonly("_name", &tiledb::Profile::get_name)
 
         .def_property_readonly("_homedir", &tiledb::Profile::get_homedir)
@@ -34,6 +36,14 @@ void init_profile(py::module& m) {
 
         .def("_save", &tiledb::Profile::save)
 
+        .def_static(
+            "_load",
+            py::overload_cast<
+                std::optional<std::string>,
+                std::optional<std::string>>(&tiledb::Profile::load),
+            py::arg("name") = std::nullopt,
+            py::arg("homedir") = std::nullopt)
+
         .def("_remove", &tiledb::Profile::remove)
 
         .def("_dump", &tiledb::Profile::dump);

tiledb/profile.py

@@ -38,7 +38,7 @@ def __repr__(self):
         """
         return self._dump()
 
-    def set_param(self, param: str, value: str):
+    def __setitem__(self, param: str, value: str):
         """Sets a parameter for the profile.
 
         :param param: The parameter name.
@@ -47,8 +47,7 @@ def set_param(self, param: str, value: str):
         """
         self._set_param(param, value)
 
-    # maybe provide square brackets overload?
-    def get_param(self, param: str):
+    def __getitem__(self, param: str):
         """Gets a parameter for the profile.
 
         :param param: The parameter name.
@@ -57,14 +56,31 @@ def get_param(self, param: str):
         return self._get_param(param)
 
     def save(self):
-        """Saves the profile.
+        """Saves the profile to storage.
 
         :raises tiledb.TileDBError:
         """
         self._save()
 
+    @classmethod
+    def load(cls, name: str = None, homedir: str = None) -> "Profile":
+        """Loads a profile from storage.
+
+        :param name: The name of the profile.
+        :param homedir: The home directory of the profile.
+        :return: The loaded profile.
+        :rtype: tiledb.Profile
+        :raises tiledb.TileDBError:
+        """
+        # This is a workaround for the from_pybind11 method due to the fact
+        # that this class does not inherit from CtxMixin, as is commonly done.
+        lt_obj = lt.Profile._load(name, homedir)
+        py_obj = cls.__new__(cls)
+        lt.Profile.__init__(py_obj, lt_obj)
+        return py_obj
+
     def remove(self):
-        """Removes the profile.
+        """Removes the profile from storage.
 
         :raises tiledb.TileDBError:
         """

tiledb/tests/test_profile.py

@@ -1,4 +1,4 @@
-import os
+from pathlib import Path
 
 import pytest
 
@@ -25,7 +25,6 @@ def setup_method(self):
         self.profile4 = tiledb.Profile(
             "test_profile", self.path("profile4_dir")
         )  # named profile with custom home directory
-        self.vfs.create_dir(self.path("profile4_dir"))
 
 
 class ProfileTest(ProfileTestCase):
@@ -36,31 +35,54 @@ def test_profile_name(self):
         assert self.profile4.name == "test_profile"
 
     def test_profile_homedir(self):
-        assert self.profile3.homedir == self.path("profile3_dir")
-        assert self.profile4.homedir == self.path("profile4_dir")
+        assert Path(self.profile1.homedir) == Path.home()
+        assert Path(self.profile2.homedir) == Path.home()
+        assert Path(self.profile3.homedir) == Path(self.path("profile3_dir"))
+        assert Path(self.profile4.homedir) == Path(self.path("profile4_dir"))
 
     def test_profile_set_get_param(self):
-        self.profile1.set_param("rest.username", "my_username")
-        assert self.profile1.get_param("rest.username") == "my_username"
+        self.profile1["rest.username"] = "my_username"
+        assert self.profile1["rest.username"] == "my_username"
 
-        self.profile3.set_param("rest.server_address", "https://myaddress.com")
-        assert self.profile3.get_param("rest.server_address") == "https://myaddress.com"
+        self.profile3["rest.server_address"] = "https://myaddress.com"
+        assert self.profile3["rest.server_address"] == "https://myaddress.com"
 
     def test_profile_repr(self):
-        assert 'rest.password": ""' in repr(self.profile1)
-        # set a parameter and check the repr again
-        self.profile1.set_param("rest.password", "test")
-        assert 'rest.password": "test"' in repr(self.profile1)
-
-    def test_profile_save(self):
-        assert os.path.exists(self.profile4.homedir)
-
-        tiledb_dir = os.path.join(self.profile4.homedir, ".tiledb")
-        assert not os.path.exists(tiledb_dir)
-
+        self.profile1["rest.password"] = "testing_the_password"
+        self.profile1["rest.payer_namespace"] = "testing_the_namespace"
+        self.profile1["rest.server_address"] = "https://testing_the_address.com"
+        self.profile1["rest.token"] = "testing_the_token"
+        self.profile1["rest.username"] = "testing_the_username"
+
+        import json
+
+        goal_dict = {
+            "default": {
+                "rest.password": "testing_the_password",
+                "rest.payer_namespace": "testing_the_namespace",
+                "rest.server_address": "https://testing_the_address.com",
+                "rest.token": "testing_the_token",
+                "rest.username": "testing_the_username",
+            }
+        }
+
+        assert goal_dict == json.loads(repr(self.profile1))
+
+    def test_profile_set_save_load_get(self):
+        self.profile4["rest.token"] = "testing_the_token_for_profile4"
+        self.profile4["rest.payer_namespace"] = "testing_the_namespace_for_profile4"
+
+        # save the profile
         self.profile4.save()
 
-        # this fails ... for some reason
-        assert os.path.exists(tiledb_dir)
-
-    # TODO: also test remove
+        # load
+        new_profile = tiledb.Profile.load("test_profile", self.path("profile4_dir"))
+        assert new_profile.name == "test_profile"
+        assert new_profile.homedir == self.path("profile4_dir")
+        assert new_profile["rest.username"] == ""
+        assert new_profile["rest.password"] == ""
+        assert new_profile["rest.server_address"] == "https://api.tiledb.com"
+        assert new_profile["rest.token"] == "testing_the_token_for_profile4"
+        assert (
+            new_profile["rest.payer_namespace"] == "testing_the_namespace_for_profile4"
+        )