Merge pull request #347 from terminusdb/remove_old_code

Remove old/unused code and test more

Author: GavinMendelGleason

terminusdb_client/client/Client.py

@@ -8,7 +8,6 @@
 import warnings
 from collections.abc import Iterable
 from datetime import datetime
-from enum import Enum
 from typing import Any, Dict, List, Optional, Union
 
 import requests
@@ -51,17 +50,6 @@ def __call__(self, r):
         return r
 
 
-class ResourceType(Enum):
-    """Enum for the different TerminusDB resources"""
-
-    DB = 1
-    META = 2
-    REPO = 3
-    COMMITS = 4
-    REF = 5
-    BRANCH = 6
-
-
 class Patch:
     def __init__(self, json=None):
         if json:
@@ -582,48 +570,6 @@ def set_db(self, dbid: str, team: Optional[str] = None) -> str:
             repo=self.repo,
         )
 
-    def resource(self, ttype: ResourceType, val: Optional[str] = None) -> str:
-        """Create a resource identifier string based on the current config.
-
-        Parameters
-        ----------
-        ttype : ResourceType
-            Type of resource.
-        val : str, optional
-            Branch or commit identifier.
-
-        Returns
-        -------
-        str
-            The constructed resource string.
-
-        Examples
-        --------
-        >>> client = Client("http://127.0.0.1:6363")
-        >>> client.resource(ResourceType.DB)
-        '<team>/<db>/'
-        >>> client.resource(ResourceType.META)
-        '<team>/<db>/_meta'
-        >>> client.resource(ResourceType.COMMITS)
-        '<team>/<db>/<repo>/_commits'
-        >>> client.resource(ResourceType.REF, "<reference>")
-        '<team>/<db>/<repo>/commit/<reference>'
-        >>> client.resource(ResourceType.BRANCH, "<branch>")
-        '<team>/<db>/<repo>/branch/<branch>'
-        """
-        base = self.team + "/" + self.db + "/"
-        ref_value = val if val else self.ref
-        branch_value = val if val else self.branch
-        urls = {
-            ResourceType.DB: base,
-            ResourceType.META: f"{base}_meta",
-            ResourceType.REPO: f"{base}{self.repo}/_meta",
-            ResourceType.COMMITS: f"{base}{self.repo}/_commits",
-            ResourceType.REF: f"{base}{self.repo}/commit/{ref_value}",
-            ResourceType.BRANCH: f"{base}{self.repo}/{branch_value}",
-        }
-        return urls[ttype]
-
     def _get_prefixes(self):
         """Get the prefixes for a given database"""
         self._check_connection()

terminusdb_client/tests/integration_tests/test_client.py

@@ -10,8 +10,6 @@
 from terminusdb_client.client.Client import Patch, Client
 from terminusdb_client.woqlquery.woql_query import WOQLQuery
 
-# from terminusdb_client.woqlquery.woql_query import WOQLQuery
-
 test_user_agent = "terminusdb-client-python-tests"
 
 
@@ -276,6 +274,32 @@ def test_has_doc(docker_url):
     assert client.has_doc(doc_id)
 
 
+def test_get_organization_user_databases(docker_url):
+    client = Client(docker_url, user_agent=test_user_agent, team="admin")
+    client.connect()
+    db_name = "testDB" + str(random())
+    db_name2 = "testDB" + str(random())
+    org_name = "testOrg235091"
+    # Add DB in admin org to make sure they don't appear in other team
+    client.create_database(db_name + "admin", team="admin")
+    client.create_organization(org_name)
+    client.create_database(db_name, team=org_name)
+    client.create_database(db_name2, team=org_name)
+    capability_change = {
+        "operation": "grant",
+        "scope": f"Organization/{org_name}",
+        "user": "User/admin",
+        "roles": [
+            "Role/admin"
+        ]
+    }
+    client.change_capabilities(capability_change)
+    databases = client.get_organization_user_databases(org=org_name, username="admin")
+    assert len(databases) == 2
+    assert databases[0]['name'] == db_name
+    assert databases[1]['name'] == db_name2
+
+
 def test_has_database(docker_url):
     client = Client(docker_url, user_agent=test_user_agent, team="admin")
     client.connect()
@@ -285,6 +309,17 @@ def test_has_database(docker_url):
     assert not client.has_database("DOES_NOT_EXISTDB")
 
 
+def test_optimize(docker_url):
+    client = Client(docker_url, user_agent=test_user_agent, team="admin")
+    client.connect()
+    db_name = "testDB" + str(random())
+    client.create_database(db_name, team="admin")
+    client.connect(db=db_name)
+    for x in range(0, 10):
+        client.insert_document({"name": f"Philosopher{x}"}, raw_json=True)
+    client.optimize(f"admin/{db_name}")
+
+
 def test_add_get_remove_user(docker_url):
     # create client
     client = Client(docker_url, user_agent=test_user_agent)
@@ -387,34 +422,6 @@ def test_diff_ops(docker_url, test_schema):
     my_schema = test_schema.copy()
     my_schema.object.pop("Employee")
     assert my_schema.to_dict() != test_schema.to_dict()
-    ## Temporary switch off schema diff
-    # result = client.diff(test_schema, my_schema)
-    # assert result.content == {
-    #     "@op": "CopyList",
-    #     "@rest": {
-    #         "@after": [],
-    #         "@before": [
-    #             {
-    #                 "@id": "Employee",
-    #                 "@inherits": ["Person"],
-    #                 "@key": {"@type": "Random"},
-    #                 "@type": "Class",
-    #                 "address_of": "Address",
-    #                 "age": "xsd:integer",
-    #                 "contact_number": {"@class": "xsd:string", "@type": "Optional"},
-    #                 "friend_of": {"@class": "Person", "@type": "Set"},
-    #                 "managed_by": "Employee",
-    #                 "member_of": "Team",
-    #                 "name": "xsd:string",
-    #                 "permisstion": {"@class": "Role", "@type": "Set"},
-    #             }
-    #         ],
-    #         "@op": "SwapList",
-    #         "@rest": {"@op": "KeepList"},
-    #     },
-    #     "@to": 4,
-    # }
-    # assert client.patch(test_schema, result) == my_schema.to_dict()
 
 
 @pytest.mark.skipif(
@@ -524,67 +531,3 @@ def test_terminusx_crazy_path(terminusx_token):
     client.delete_database(testdb, "TerminusDBTest")
     assert client.db is None
     assert testdb not in client.list_databases()
-
-
-#
-# def _generate_csv(option):
-#     if option == 1:
-#         file_path = "employee_file.csv"
-#         with open(file_path, mode="w") as employee_file:
-#             employee_writer = csv.writer(
-#                 employee_file, delimiter=",", quotechar='"', quoting=csv.QUOTE_MINIMAL
-#             )
-#             employee_writer.writerow(["John Smith", "Accounting", "November"])
-#             employee_writer.writerow(["Erica Meyers", "IT", "March"])
-#         return file_path
-#     else:
-#         file_path = "employee_file.csv"
-#         with open(file_path, mode="w") as employee_file:
-#             employee_writer = csv.writer(
-#                 employee_file, delimiter=",", quotechar='"', quoting=csv.QUOTE_MINIMAL
-#             )
-#             employee_writer.writerow(["Cow Duck", "Marketing", "April"])
-#         return file_path
-#
-#
-# def _file_clean_up(filename):
-#     if os.path.exists(filename):
-#         os.remove(filename)
-#
-#
-# def test_csv_handeling(docker_url):
-#     client = Client(docker_url)
-#     assert not client._connected
-#     # test connect
-#     client.connect()
-#     assert client._connected
-#     # test create db
-#     client.create_database("test_csv")
-#     client._get_current_commit()
-#     assert client._db == "test_csv"
-#     assert "test_csv" in client.list_databases()
-#     csv_file_path = _generate_csv(1)  # create testing csv
-#     try:
-#         client.insert_csv(csv_file_path)
-#         client.get_csv(csv_file_path, csv_output_name="new_" + csv_file_path)
-#         assert filecmp.cmp(csv_file_path, "new_" + csv_file_path)
-#         csv_file_path = _generate_csv(2)
-#         client.update_csv(csv_file_path)
-#         client.get_csv(csv_file_path, csv_output_name="update_" + csv_file_path)
-#         assert not filecmp.cmp("new_" + csv_file_path, "update_" + csv_file_path)
-#     finally:
-#         _file_clean_up(csv_file_path)
-#         _file_clean_up("new_" + csv_file_path)
-#         _file_clean_up("update_" + csv_file_path)
-#
-
-# def test_create_graph(docker_url):
-#     client = Client(docker_url)
-#     assert not client._connected
-#     # test connect
-#     client.connect()
-#     assert client._connected
-#     # test create db
-#     client.create_database("test_graph")
-#     client.create_graph("instance", "test-one-more-graph", "create test graph")
-#     client.delete_graph("instance", "test-one-more-graph", "delete test graph")

terminusdb_client/tests/test_Client.py

@@ -15,17 +15,6 @@
 from .conftest import mocked_request_insert_delete, mocked_request_success
 from .woqljson.woqlStarJson import WoqlStar
 
-# def mock_func_with_1arg(_):
-#     return True
-#
-#
-# def mock_func_with_2arg(first, second):
-#     return True
-#
-#
-# def mock_func_no_arg():
-#     return True
-
 
 @mock.patch("requests.get", side_effect=mocked_request_success)
 def test_connection(mocked_requests):