tablemaster 2.1.4__tar.gz → 2.1.6__tar.gz

{tablemaster-2.1.4 → tablemaster-2.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tablemaster
-Version: 2.1.4
+Version: 2.1.6
 Summary: tablemaster is a Python toolkit for moving and managing tabular data across databases, Feishu/Lark, Google Sheets, and local files with one consistent API.
 Author-email: Livid <livid.su@gmail.com>
 Project-URL: Homepage, https://github.com/ilivid/tablemaster

{tablemaster-2.1.4 → tablemaster-2.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tablemaster"
-version = "2.1.4"
+version = "2.1.6"
 description = "tablemaster is a Python toolkit for moving and managing tabular data across databases, Feishu/Lark, Google Sheets, and local files with one consistent API."
 readme = "README.md"
 requires-python = ">=3.9"

{tablemaster-2.1.4 → tablemaster-2.1.6}/tablemaster/feishu.py

@@ -10,12 +10,53 @@ logger = logging.getLogger(__name__)
 _TOKEN_CACHE = {}
 
 
+def _normalize_url(url):
+    normalized = url.strip()
+    if '`' in normalized:
+        logger.warning('url contains backticks, auto sanitize')
+        normalized = normalized.replace('`', '').strip()
+    return normalized
+
+
+def _parse_json_response(response, context):
+    if response.status_code >= 400:
+        body_preview = response.text[:500].replace('\n', ' ')
+        raise requests.HTTPError(
+            f'{context} failed with status={response.status_code}, body={body_preview}',
+            response=response
+        )
+
+    content_type = response.headers.get('Content-Type', '')
+    if 'application/json' not in content_type.lower():
+        body_preview = response.text[:500].replace('\n', ' ')
+        raise ValueError(
+            f'{context} expected JSON but got Content-Type={content_type}, body={body_preview}'
+        )
+
+    try:
+        return response.json()
+    except ValueError as exc:
+        body_preview = response.text[:500].replace('\n', ' ')
+        raise ValueError(f'{context} invalid JSON response, body={body_preview}') from exc
+
+
+def _ensure_feishu_success(body, context):
+    if not isinstance(body, dict):
+        raise ValueError(f'{context} expected dict JSON body')
+    code = body.get('code')
+    if code != 0:
+        msg = body.get('msg', 'Unknown error')
+        raise RuntimeError(f'{context} failed with code={code}, msg={msg}')
+    return body
+
+
 def _request_with_retry(method, url, headers=None, params=None, json_data=None, data=None, timeout=30):
     max_retries = 3
+    normalized_url = _normalize_url(url)
     for attempt in range(max_retries):
         response = requests.request(
             method=method,
-            url=url,
+            url=normalized_url,
             headers=headers,
             params=params,
             json=json_data,
@@ -45,8 +86,11 @@ def _get_tenant_access_token(feishu_cfg):
         "app_secret": feishu_cfg.feishu_app_secret
     }
     r = _request_with_retry("post", feishu_url, json_data=post_data)
-    body = r.json()
-    token = body["tenant_access_token"]
+    body = _parse_json_response(r, 'get tenant access token')
+    _ensure_feishu_success(body, 'get tenant access token')
+    token = body.get("tenant_access_token")
+    if not token:
+        raise KeyError('tenant_access_token is missing in auth response')
     expire_seconds = int(body.get('expire', 7200))
     _TOKEN_CACHE[cache_key] = {
         'token': token,
@@ -91,7 +135,17 @@ def fs_read_df(sheet_address, feishu_cfg):
         + "?valueRenderOption=ToString&dateTimeRenderOption=FormattedString"
     )
     r = _request_with_retry("get", url, headers=header)
-    pull_data = r.json()['data']['valueRange']['values']
+    body = _parse_json_response(r, 'read sheets values')
+    _ensure_feishu_success(body, 'read sheets values')
+
+    pull_data = body.get('data', {}).get('valueRange', {}).get('values')
+    if not pull_data:
+        logger.info('sheet is empty: %s', sheet_address)
+        return pd.DataFrame()
+    if not isinstance(pull_data, list):
+        raise ValueError('unexpected sheets values structure: values is not a list')
+    if not pull_data[0]:
+        return pd.DataFrame(pull_data[1:] if len(pull_data) > 1 else [])
     return pd.DataFrame(pull_data[1:], columns=pull_data[0])
 
 
@@ -127,7 +181,9 @@ def fs_read_base(sheet_address, feishu_cfg):
             query_params += f"&page_token={page_token}"
 
         r = _request_with_retry("get", base_url + query_params, headers=header)
-        data = r.json().get('data', {})
+        body = _parse_json_response(r, 'read bitable records')
+        _ensure_feishu_success(body, 'read bitable records')
+        data = body.get('data', {})
         pull_data.extend(data.get('items', []))
         has_more = data.get('has_more', False)
         page_token = data.get('page_token')
@@ -263,13 +319,10 @@ def _get_bitable_fields(app_token, table_id, header):
     """
     url = f"https://open.feishu.cn/open-apis/bitable/v1/apps/{app_token}/tables/{table_id}/fields"
     r = _request_with_retry("get", url, headers=header)
-    
-    if r.status_code == 200 and r.json().get('code') == 0:
-        items = r.json().get('data', {}).get('items', [])
-        return {item['field_name'] for item in items}
-    else:
-        logger.warning("failed to get fields: %s", r.json().get('msg', 'Unknown error'))
-        return set()
+    body = _parse_json_response(r, 'get bitable fields')
+    _ensure_feishu_success(body, 'get bitable fields')
+    items = body.get('data', {}).get('items', [])
+    return {item['field_name'] for item in items}
 
 def fs_write_base(sheet_address, df, feishu_cfg, clear_table=False):
     """

{tablemaster-2.1.4 → tablemaster-2.1.6}/tablemaster/gspread.py

@@ -1,8 +1,12 @@
 import gspread
+import json
+import math
 import pandas as pd
+import numpy as np
 import re
 import warnings
 import logging
+from datetime import date, datetime, time
 from functools import lru_cache
 
 logger = logging.getLogger(__name__)
@@ -19,6 +23,85 @@ def _warn_deprecated(message):
     warnings.warn(f'{message} This usage will be removed in a future release.', FutureWarning, stacklevel=3)
 
 
+def _json_safe(value):
+    if value is None or value is pd.NA or value is pd.NaT:
+        return None
+
+    if isinstance(value, pd.Timestamp):
+        return None if pd.isna(value) else value.isoformat()
+    if isinstance(value, pd.Timedelta):
+        return None if pd.isna(value) else str(value)
+    if isinstance(value, np.datetime64):
+        return None if np.isnat(value) else pd.Timestamp(value).isoformat()
+    if isinstance(value, np.timedelta64):
+        try:
+            if np.isnat(value):
+                return None
+        except TypeError:
+            pass
+        return str(pd.Timedelta(value))
+    if isinstance(value, (datetime, date, time)):
+        return value.isoformat()
+
+    if isinstance(value, (float, np.floating)):
+        if np.isnan(value) or np.isinf(value):
+            return None
+        return float(value)
+    if isinstance(value, np.integer):
+        return int(value)
+    if isinstance(value, np.bool_):
+        return bool(value)
+
+    if isinstance(value, dict):
+        return {k: _json_safe(v) for k, v in value.items()}
+    if isinstance(value, (list, tuple, set)):
+        return [_json_safe(v) for v in value]
+    if isinstance(value, np.ndarray):
+        return [_json_safe(v) for v in value.tolist()]
+
+    try:
+        if math.isnan(value) or math.isinf(value):
+            return None
+    except Exception:
+        pass
+
+    return value
+
+
+def _build_values(df):
+    safe_cols = [_json_safe(col) for col in df.columns.tolist()]
+    safe_cols = [("" if col is None else col) for col in safe_cols]
+    for col_index, col_value in enumerate(safe_cols, start=1):
+        try:
+            json.dumps(col_value, allow_nan=False)
+        except (TypeError, ValueError) as exc:
+            raise ValueError(f'column header at col {col_index} is not JSON serializable: {exc}') from exc
+
+    rows = df.values.tolist()
+    safe_rows = []
+    for row_index, row in enumerate(rows, start=2):
+        safe_row = []
+        for col_index, cell in enumerate(row, start=1):
+            safe_cell = _json_safe(cell)
+            safe_cell = '' if safe_cell is None else safe_cell
+            try:
+                json.dumps(safe_cell, allow_nan=False)
+            except (TypeError, ValueError) as exc:
+                column_name = str(df.columns[col_index - 1])
+                raise ValueError(
+                    f'cell at row {row_index}, col {col_index} ({column_name}) is not JSON serializable: {exc}'
+                ) from exc
+            safe_row.append(safe_cell)
+        safe_rows.append(safe_row)
+
+    values = [safe_cols] + safe_rows
+    try:
+        json.dumps({'values': values}, allow_nan=False)
+    except (TypeError, ValueError) as exc:
+        raise ValueError(f'worksheet payload contains non-JSON-safe data: {exc}') from exc
+    return values
+
+
 def _resolve_service_account_path(cfg, service_account_path):
     if service_account_path:
         _warn_deprecated('service_account_path argument is deprecated; pass a cfg object instead.')
@@ -123,10 +206,8 @@ def gs_write_df(address, df, cfg=None, loc='A1', service_account_path=None):
     try:
         wks.clear()
         df_copy = df.copy()
-        non_float_int_columns = df_copy.select_dtypes(exclude=['float64', 'int64']).columns
-        for col in non_float_int_columns:
-            df_copy[col] = df_copy[col].astype(str)
-        wks.update(loc, ([df_copy.columns.values.tolist()] + df_copy.values.tolist()))
+        values = _build_values(df_copy)
+        wks.update(loc, values)
 
         logger.info('data is written')
     except Exception as e:

{tablemaster-2.1.4 → tablemaster-2.1.6}/tablemaster.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tablemaster
-Version: 2.1.4
+Version: 2.1.6
 Summary: tablemaster is a Python toolkit for moving and managing tabular data across databases, Feishu/Lark, Google Sheets, and local files with one consistent API.
 Author-email: Livid <livid.su@gmail.com>
 Project-URL: Homepage, https://github.com/ilivid/tablemaster