Add support for table management and column management (#7)

* use urljoin instead of string concatenation, added gitignore

* added table management endpoints

* added table column endpoints

* fixed a name clash with the get_table_uri method

Author: jangxx

.gitignore

@@ -0,0 +1 @@
+__pycache__

nocodb/api.py

@@ -1,30 +1,26 @@
 from enum import Enum
+from urllib.parse import urljoin
 from .nocodb import NocoDBProject
 
 
 class NocoDBAPIUris(Enum):
-    V1_DB_DATA_PREFIX = "api/v1/db/data"
-    V1_DB_META_PREFIX = "api/v1/db/meta"
+    V1_DB_DATA_PREFIX = "api/v1/db/data/"
+    V1_DB_META_PREFIX = "api/v1/db/meta/"
 
 
 class NocoDBAPI:
     def __init__(self, base_uri: str):
-        self.__base_data_uri = (
-            f"{base_uri}/{NocoDBAPIUris.V1_DB_DATA_PREFIX.value}"
-        )
-        self.__base_meta_uri = (
-            f"{base_uri}/{NocoDBAPIUris.V1_DB_META_PREFIX.value}"
-        )
+        self.__base_data_uri = urljoin(base_uri + "/", NocoDBAPIUris.V1_DB_DATA_PREFIX.value)
+        self.__base_meta_uri = urljoin(base_uri + "/", NocoDBAPIUris.V1_DB_META_PREFIX.value)
 
     def get_table_uri(self, project: NocoDBProject, table: str) -> str:
-        return "/".join(
+        return urljoin(self.__base_data_uri, "/".join(
             (
-                self.__base_data_uri,
                 project.org_name,
                 project.project_name,
                 table,
             )
-        )
+        ))
 
     def get_table_count_uri(self, project: NocoDBProject, table: str) -> str:
         return "/".join(
@@ -45,15 +41,14 @@ def get_table_find_one_uri(self, project: NocoDBProject, table: str) -> str:
     def get_row_detail_uri(
         self, project: NocoDBProject, table: str, row_id: int
     ):
-        return "/".join(
+        return urljoin(self.__base_data_uri, "/".join(
             (
-                self.__base_data_uri,
                 project.org_name,
                 project.project_name,
                 table,
                 str(row_id),
             )
-        )
+        ))
 
     def get_nested_relations_rows_list_uri(
         self,
@@ -63,24 +58,57 @@ def get_nested_relations_rows_list_uri(
         row_id: int,
         column_name: str,
     ) -> str:
-        return "/".join(
+        return urljoin(self.__base_data_uri, "/".join(
             (
-                self.__base_data_uri,
                 project.org_name,
                 project.project_name,
                 table,
                 str(row_id),
                 relation_type,
                 column_name,
             )
-        )
+        ))
 
     def get_project_uri(
         self,
     ) -> str:
-        return "/".join(
+        return urljoin(self.__base_meta_uri, "projects")
+
+    def get_project_tables_uri(
+        self, project: NocoDBProject,
+    ) -> str:
+        return urljoin(self.__base_meta_uri, "/".join(
             (
-                self.__base_meta_uri,
-                "projects"
+                "projects",
+                project.project_name,
+                "tables"
             )
-        )
+        ))
+    
+    def get_table_meta_uri(
+        self, tableId: str, operation: str = None,
+    ) -> str:
+        additional_path = []
+        if operation is not None:
+            additional_path.append(operation)
+
+        return urljoin(self.__base_meta_uri, "/".join(
+            [
+                "tables",
+                tableId,
+            ] + additional_path
+        ))
+    
+    def get_column_uri(
+        self, columnId: str, operation: str = None,
+    ) -> str:
+        additional_path = []
+        if operation is not None:
+            additional_path.append(operation)
+
+        return urljoin(self.__base_meta_uri, "/".join(
+            [
+                "columns",
+                columnId,
+            ] + additional_path
+        ))

nocodb/infra/requests_client.py

@@ -122,3 +122,81 @@ def project_create(self, body):
         return self._request(
             "POST", self.__api_info.get_project_uri(), json=body
         ).json()
+
+    def table_create(
+        self, project: NocoDBProject, body: dict
+    ) -> dict:
+        return self.__session.post(
+            url=self.__api_info.get_project_tables_uri(project),
+            json=body,
+        ).json()
+
+    def table_list(
+        self,
+        project: NocoDBProject,
+        params: Optional[dict] = None,
+    ) -> dict:
+        return self.__session.get(
+            url=self.__api_info.get_project_tables_uri(project),
+            params=params,
+        ).json()
+
+    def table_read(
+        self, tableId: str,
+    ) -> dict:
+        return self.__session.get(
+            url=self.__api_info.get_table_meta_uri(tableId)
+        ).json()
+
+    def table_update(
+        self, tableId: str, body: dict
+    ):
+        return self.__session.patch(
+            url=self.__api_info.get_table_meta_uri(tableId),
+            json=body,
+        ).json()
+
+    def table_delete(
+        self, tableId: str,
+    ) -> dict:
+        return self.__session.delete(
+            url=self.__api_info.get_table_meta_uri(tableId)
+        ).json()
+
+    def table_reorder(
+        self, tableId: str, order: int
+    ) -> dict:
+        return self.__session.post(
+            url=self.__api_info.get_table_meta_uri(tableId, "reorder"),
+            json={ "order": order }
+        ).json()
+    
+    def table_column_create(
+        self, tableId: str, body: dict,
+    ) -> dict:
+        return self.__session.post(
+            url=self.__api_info.get_table_meta_uri(tableId, "columns"),
+            json=body,
+        ).json()
+
+    def table_column_update(
+        self, columnId: str, body: dict,
+    ) -> dict:
+        return self.__session.patch(
+            url=self.__api_info.get_column_uri(columnId),
+            json=body,
+        ).json()
+
+    def table_column_delete(
+        self, columnId: str,
+    ) -> dict:
+        return self.__session.delete(
+            url=self.__api_info.get_column_uri(columnId)
+        ).json()
+
+    def table_column_set_primary(
+        self, columnId: str,
+    ) -> bool:
+        return self.__session.post(
+            url=self.__api_info.get_column_uri(columnId, "primary"),
+        ).json()

nocodb/nocodb.py

@@ -134,3 +134,65 @@ def table_row_nested_relations_list(
         column_name: str,
     ) -> dict:
         pass
+
+    @abstractmethod
+    def table_create(
+        self, project: NocoDBProject, body: dict
+    ) -> dict:
+        pass
+
+    @abstractmethod
+    def table_list(
+        self,
+        project: NocoDBProject,
+        params: Optional[dict] = None,
+    ) -> dict:
+        pass
+
+    @abstractmethod
+    def table_read(
+        self, tableId: str,
+    ) -> dict:
+        pass
+
+    @abstractmethod
+    def table_update(
+        self, tableId: str, body: dict,
+    ) -> bool:
+        pass
+
+    @abstractmethod
+    def table_delete(
+        self, tableId: str,
+    ) -> dict:
+        pass
+
+    @abstractmethod
+    def table_reorder(
+        self, tableId: str, order: int,
+    ) -> dict:
+        pass
+
+    @abstractmethod
+    def table_column_create(
+        self, tableId: str, body: dict,
+    ) -> dict:
+        pass
+
+    @abstractmethod
+    def table_column_update(
+        self, columnId: str, body: dict,
+    ) -> dict:
+        pass
+
+    @abstractmethod
+    def table_column_delete(
+        self, columnId: str,
+    ) -> dict:
+        pass
+
+    @abstractmethod
+    def table_column_set_primary(
+        self, columnId: str,
+    ) -> dict:
+        pass