Merge pull request #72 from seatable/support-table-id-params

update

Author: freeplant

seatable_api/main.py

@@ -1,5 +1,6 @@
 import io
 import json
+import re
 from datetime import datetime, timedelta
 from urllib import parse
 from uuid import UUID
@@ -45,6 +46,9 @@ def parse_response(response):
         except:
             pass
 
+def like_table_id(value):
+    return re.match(r'^[-0-9a-zA-Z]{4}$', value)
+
 
 class SeaTableAPI(object):
     """SeaTable API
@@ -237,8 +241,11 @@ def list_rows(self, table_name, view_name=None, order_by=None, desc=False, start
         """
         url = self._row_server_url()
         params = {
-            'table_name': table_name,
+            'table_name': table_name
         }
+
+        if like_table_id(table_name):
+            params['table_id'] = table_name
         if view_name:
             params['view_name'] = view_name
         if order_by:
@@ -260,8 +267,11 @@ def get_row(self, table_name, row_id):
         """
         url = self._row_server_url() + row_id + '/'
         params = {
-            'table_name': table_name,
+            'table_name': table_name
         }
+
+        if like_table_id(table_name):
+            params['table_id'] = table_name
         response = requests.get(url, params=params, headers=self.headers, timeout=self.timeout)
         data = parse_response(response)
         return data
@@ -276,6 +286,8 @@ def append_row(self, table_name, row_data):
             'table_name': table_name,
             'row': row_data,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.post(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
@@ -289,6 +301,8 @@ def batch_append_rows(self, table_name, rows_data):
             'table_name': table_name,
             'rows': rows_data,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.post(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
@@ -304,6 +318,8 @@ def insert_row(self, table_name, row_data, anchor_row_id):
             'row': row_data,
             'anchor_row_id': anchor_row_id,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.post(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
@@ -319,6 +335,8 @@ def update_row(self, table_name, row_id, row_data):
             'row_id': row_id,
             'row': row_data,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.put(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
@@ -333,6 +351,8 @@ def batch_update_rows(self, table_name, rows_data):
             'table_name': table_name,
             'updates': rows_data,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.put(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
@@ -346,6 +366,8 @@ def delete_row(self, table_name, row_id):
             'table_name': table_name,
             'row_id': row_id,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.delete(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
@@ -359,6 +381,8 @@ def batch_delete_rows(self, table_name, row_ids):
             'table_name': table_name,
             'row_ids': row_ids,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.delete(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
@@ -442,6 +466,10 @@ def add_link(self, link_id, table_name, other_table_name, row_id, other_row_id):
             'table_row_id': row_id,
             'other_table_row_id': other_row_id,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
+        if like_table_id(other_table_name):
+            json_data['other_table_id'] = other_table_name
         response = requests.post(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
@@ -461,10 +489,14 @@ def remove_link(self, link_id, table_name, other_table_name, row_id, other_row_i
             'table_row_id': row_id,
             'other_table_row_id': other_row_id,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
+        if like_table_id(other_table_name):
+            json_data['other_table_id'] = other_table_name
         response = requests.delete(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
-    def update_link(self, link_id, table_id, other_table_id, row_id, other_rows_ids):
+    def update_link(self, link_id, table_name, other_table_name, row_id, other_rows_ids):
         """
         :param link_id: str
         :param table_id: str
@@ -477,15 +509,19 @@ def update_link(self, link_id, table_id, other_table_id, row_id, other_rows_ids)
         url = self._row_link_server_url()
         json_data = {
             'link_id': link_id,
-            'table_id': table_id,
-            'other_table_id': other_table_id,
+            'table_name': table_name,
+            'other_table_name': other_table_name,
             'row_id': row_id,
             'other_rows_ids': other_rows_ids,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
+        if like_table_id(other_table_name):
+            json_data['other_table_id'] = other_table_name
         response = requests.put(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
 
-    def batch_update_links(self, link_id, table_id, other_table_id, row_id_list, other_rows_ids_map):
+    def batch_update_links(self, link_id, table_name, other_table_name, row_id_list, other_rows_ids_map):
         """
         :param link_id: str
         :param table_id: str
@@ -496,11 +532,16 @@ def batch_update_links(self, link_id, table_id, other_table_id, row_id_list, oth
         url = self._batch_update_row_link_server_url()
         json_data = {
             'link_id': link_id,
-            'table_id': table_id,
-            'other_table_id': other_table_id,
+            'table_name': table_name,
+            'other_table_name': other_table_name,
+
             'row_id_list': row_id_list,
             'other_rows_ids_map': other_rows_ids_map,
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
+        if like_table_id(other_table_name):
+            json_data['other_table_id'] = other_table_name
 
         response = requests.put(url, json=json_data, headers=self.headers, timeout=self.timeout)
         return parse_response(response)
@@ -530,6 +571,8 @@ def list_columns(self, table_name, view_name=None):
         params = {
             'table_name': table_name,
         }
+        if like_table_id(table_name):
+            params['table_id'] = table_name
         if view_name:
             params['view_name'] = view_name
         response = requests.get(url, params=params, headers=self.headers, timeout=self.timeout)
@@ -560,6 +603,8 @@ def insert_column(self, table_name, column_name, column_type, column_key=None, c
             'column_name': column_name,
             'column_type': column_type.value
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         if column_key:
             json_data['anchor_column'] = column_key
         if column_data:
@@ -582,6 +627,8 @@ def rename_column(self, table_name, column_key, new_column_name):
             'column': column_key,
             'new_column_name': new_column_name
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.put(url, json=json_data, headers=self.headers, timeout=self.timeout)
         data = parse_response(response)
         return data
@@ -601,6 +648,8 @@ def resize_column(self, table_name, column_key, new_column_width):
             'column': column_key,
             'new_column_width': new_column_width
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.put(url, json=json_data, headers=self.headers, timeout=self.timeout)
         data = parse_response(response)
         return data
@@ -619,6 +668,8 @@ def freeze_column(self, table_name, column_key, frozen):
             'column': column_key,
             'frozen': frozen
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.put(url, json=json_data, headers=self.headers, timeout=self.timeout)
         data = parse_response(response)
         return data
@@ -637,6 +688,8 @@ def move_column(self, table_name, column_key, target_column_key):
             'column': column_key,
             'target_column': target_column_key
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.put(url, json=json_data, headers=self.headers, timeout=self.timeout)
         data = parse_response(response)
         return data
@@ -657,6 +710,8 @@ def modify_column_type(self, table_name, column_key, new_column_type):
             'column': column_key,
             'new_column_type': new_column_type.value
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.put(url, json=json_data, headers=self.headers, timeout=self.timeout)
         data = parse_response(response)
         return data
@@ -673,6 +728,8 @@ def add_column_options(self, table_name, column, options):
             "column": column,
             "options": options
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.post(url, json=json_data, headers=self.headers, timeout=self.timeout)
         data = parse_response(response)
         return data
@@ -693,7 +750,8 @@ def add_column_cascade_settings(self, table_name, child_column, parent_column, c
             "parent_column": parent_column,
             "cascade_settings": cascade_settings
         }
-
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.post(url, json=json_data, headers=self.headers, timeout=self.timeout)
         data = parse_response(response)
         return data
@@ -709,6 +767,8 @@ def delete_column(self, table_name, column_key):
             'table_name': table_name,
             'column': column_key
         }
+        if like_table_id(table_name):
+            json_data['table_id'] = table_name
         response = requests.delete(url, json=json_data, headers=self.headers, timeout=self.timeout)
         data = parse_response(response)
         return data