tablemaster 2.1.1__tar.gz → 2.1.2__tar.gz

{tablemaster-2.1.1 → tablemaster-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tablemaster
-Version: 2.1.1
+Version: 2.1.2
 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.1 → tablemaster-2.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tablemaster"
-version = "2.1.1"
+version = "2.1.2"
 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.1 → tablemaster-2.1.2}/tablemaster/database.py

@@ -5,7 +5,7 @@ import warnings
 from typing import Union, List, Tuple, Dict, Any, Optional
 from functools import lru_cache
 
-from sqlalchemy import create_engine, pool, text
+from sqlalchemy import create_engine, inspect, pool, text
 from sqlalchemy.engine import Engine
 import pandas as pd
 from datetime import datetime
@@ -230,12 +230,13 @@ class ManageTable:
             bool: True if table exists, False otherwise.
         """
         safe_table: str = _safe_identifier(self.table)
-        check_sql = text(f'SELECT 1 FROM `{safe_table}` LIMIT 1')
         try:
-            opt(check_sql, self)
-            return True
-        except Exception:
-            return False
+            engine: Engine = _resolve_engine(self.configs if hasattr(self, 'configs') else self, autocommit=False)
+            inspector = inspect(engine)
+            return inspector.has_table(safe_table)
+        except Exception as e:
+            logger.exception('failed to check if table exists: %s', e)
+            raise
 
     def delete_table(self) -> None:
         """
@@ -245,8 +246,9 @@ class ManageTable:
         try:
             opt(text(f'DROP TABLE `{safe_table}`'), self)
             logger.info('%s deleted', self.table)
-        except Exception:
-            logger.exception('table was not deleted')
+        except Exception as e:
+            logger.exception('table was not deleted: %s', e)
+            raise
 
     def par_del(self, clause: str, params: Optional[Dict[str, Any]] = None) -> None:
         """
@@ -305,6 +307,7 @@ class ManageTable:
                         pbar.update(1)
                 except Exception as e:
                     logger.exception('an error occurred during upload: %s', e)
+                    raise
 
     def upsert_data(self, df: pd.DataFrame, chunk_size: int = 10000, add_date: bool = False, ignore: bool = False, key: Union[str, List[str], Tuple[str, ...], None] = None) -> None:
         """
@@ -411,6 +414,7 @@ class ManageTable:
                         pbar.update(1)
                     except Exception as e:
                         logger.exception('an error occurred during upsert: %s', e)
+                        raise
 
 class Manage_table(ManageTable):
     """
@@ -466,3 +470,4 @@ class Manage_table(ManageTable):
                         pbar.update(1)
                 except Exception as e:
                     logger.exception('an error occurred during upload: %s', e)
+                    raise

{tablemaster-2.1.1 → tablemaster-2.1.2}/tablemaster/feishu.py

@@ -178,9 +178,10 @@ def fs_write_df(sheet_address, df, feishu_cfg, loc='A1', clear_sheet=True):
             if clear_resp.json().get('code') == 0:
                 logger.info('sheet cleared')
             else:
-                logger.warning("failed to clear sheet: %s", clear_resp.json().get('msg'))
+                raise RuntimeError(f"failed to clear sheet: {clear_resp.json().get('msg')}")
         except Exception as e:
-            logger.warning('failed to clear sheet: %s', e)
+            logger.exception('failed to clear sheet: %s', e)
+            raise
     
     # 处理 DataFrame 数据类型
     df_copy = df.copy()
@@ -305,8 +306,7 @@ def fs_write_base(sheet_address, df, feishu_cfg, clear_table=False):
     existing_fields = _get_bitable_fields(app_token, table_id, header)
     
     if not existing_fields:
-        logger.error('could not fetch table fields or table has no fields')
-        return None
+        raise ValueError('could not fetch table fields or table has no fields')
     
     logger.info('table has %s fields', len(existing_fields))
     
@@ -323,8 +323,7 @@ def fs_write_base(sheet_address, df, feishu_cfg, clear_table=False):
             logger.warning('skip column: %s', field)
     
     if not valid_fields:
-        logger.error('no valid fields to write, all dataframe columns are missing in bitable')
-        return None
+        raise ValueError('no valid fields to write, all dataframe columns are missing in bitable')
     
     logger.info('will write %s valid fields', len(valid_fields))
     
@@ -360,8 +359,9 @@ def fs_write_base(sheet_address, df, feishu_cfg, clear_table=False):
                     _request_with_retry("post", delete_url, headers=header, json_data=delete_data)
                 logger.info('deleted %s records', len(record_ids))
 
-        except Exception as e:
-            logger.warning('failed to clear table: %s', e)
+        except Exception as e:
+            logger.exception('failed to clear table: %s', e)
+            raise
     
     # 处理 DataFrame - 只保留有效字段
     df_copy = df[list(valid_fields)].copy()
@@ -444,7 +444,7 @@ def fs_write_base(sheet_address, df, feishu_cfg, clear_table=False):
                     str_val = str(value)
                     if str_val and str_val != 'None' and str_val != 'nan':
                         fields[col] = str_val
-                except:
+                except Exception:
                     if col not in skipped_cols:
                         skipped_cols.add(col)
                     continue
@@ -457,6 +457,7 @@ def fs_write_base(sheet_address, df, feishu_cfg, clear_table=False):
     # 批量写入（每次最多500条）
     batch_size = 500
     all_responses = []
+    failed_batches = []
     
     for i in range(0, len(records), batch_size):
         batch = records[i:i + batch_size]
@@ -473,9 +474,11 @@ def fs_write_base(sheet_address, df, feishu_cfg, clear_table=False):
                 logger.info('batch %s wrote %s records', i // batch_size + 1, len(batch))
             else:
                 logger.error('failed to write batch: %s', response.get('msg', 'Unknown error'))
+                failed_batches.append((i // batch_size + 1, response.get('msg', 'Unknown error')))
                 
         except Exception as e:
             logger.exception('failed to write batch: %s', e)
+            failed_batches.append((i // batch_size + 1, str(e)))
     
     logger.info('write summary total records: %s', len(records))
     logger.info('write summary fields written: %s', len(valid_fields))
@@ -483,6 +486,8 @@ def fs_write_base(sheet_address, df, feishu_cfg, clear_table=False):
         logger.info('write summary fields skipped: %s', len(missing_fields))
         for field in sorted(missing_fields):
             logger.info('skip field: %s', field)
+    if failed_batches:
+        raise RuntimeError(f'bitable write failed for {len(failed_batches)} batch(es): {failed_batches}')
     logger.info('data is written')
     
     return all_responses

{tablemaster-2.1.1 → tablemaster-2.1.2}/tablemaster/gspread.py

@@ -68,14 +68,16 @@ def gs_read_df(address, cfg=None, service_account_path=None):
         return df
 
     except gspread.exceptions.SpreadsheetNotFound:
-        logger.error("spreadsheet '%s' not found", spreadsheet_identifier)
-        return None
+        message = f"spreadsheet '{spreadsheet_identifier}' not found"
+        logger.error(message)
+        raise ValueError(message)
     except gspread.exceptions.WorksheetNotFound:
-        logger.error("worksheet '%s' not found in spreadsheet", worksheet_name)
-        return None
+        message = f"worksheet '{worksheet_name}' not found in spreadsheet"
+        logger.error(message)
+        raise ValueError(message)
     except Exception as e:
         logger.exception('an unexpected error occurred: %s', e)
-        return None
+        raise
 
 
 def gs_write_df(address, df, cfg=None, loc='A1', service_account_path=None):
@@ -105,8 +107,9 @@ def gs_write_df(address, df, cfg=None, loc='A1', service_account_path=None):
 
     except gspread.exceptions.SpreadsheetNotFound:
         if is_id:
-            logger.error("spreadsheet ID '%s' not found, cannot create with specific ID", spreadsheet_identifier)
-            return
+            message = f"spreadsheet ID '{spreadsheet_identifier}' not found, cannot create with specific ID"
+            logger.error(message)
+            raise ValueError(message)
         else:
             logger.info("spreadsheet '%s' not found, creating one", spreadsheet_identifier)
             sh = gc.create(spreadsheet_identifier)
@@ -128,3 +131,4 @@ def gs_write_df(address, df, cfg=None, loc='A1', service_account_path=None):
         logger.info('data is written')
     except Exception as e:
         logger.exception('failed to update worksheet: %s', e)
+        raise

{tablemaster-2.1.1 → tablemaster-2.1.2}/tablemaster.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tablemaster
-Version: 2.1.1
+Version: 2.1.2
 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.1 → tablemaster-2.1.2}/tablemaster.egg-info/SOURCES.txt

@@ -31,4 +31,5 @@ tablemaster/schema/dialects/base.py
 tablemaster/schema/dialects/mysql.py
 tablemaster/schema/dialects/postgresql.py
 tablemaster/schema/dialects/tidb.py
+tests/test_error_visibility.py
 tests/test_schema_core.py

tablemaster-2.1.2/tests/test_error_visibility.py

@@ -0,0 +1,54 @@
+from types import SimpleNamespace
+from unittest import TestCase
+from unittest.mock import patch
+
+import pandas as pd
+
+from tablemaster.database import ManageTable
+from tablemaster.feishu import fs_write_base
+
+
+class _DummyResponse:
+    def __init__(self, body, status_code=200):
+        self._body = body
+        self.status_code = status_code
+
+    def json(self):
+        return self._body
+
+
+class ErrorVisibilityTests(TestCase):
+    def setUp(self):
+        self.db_cfg = SimpleNamespace(
+            name='test_db',
+            user='u',
+            password='p',
+            host='127.0.0.1',
+            database='d',
+            db_type='mysql',
+        )
+        self.feishu_cfg = SimpleNamespace(feishu_app_id='id', feishu_app_secret='secret')
+
+    def test_manage_table_exists_propagates_errors(self):
+        table = ManageTable('orders', self.db_cfg)
+        with patch('tablemaster.database._resolve_engine', side_effect=RuntimeError('db unavailable')):
+            with self.assertRaises(RuntimeError):
+                table.exists()
+
+    def test_delete_table_propagates_errors(self):
+        table = ManageTable('orders', self.db_cfg)
+        with patch('tablemaster.database.opt', side_effect=RuntimeError('drop failed')):
+            with self.assertRaises(RuntimeError):
+                table.delete_table()
+
+    def test_fs_write_base_raises_when_batch_write_failed(self):
+        df = pd.DataFrame({'a': [1]})
+
+        with patch('tablemaster.feishu._get_tenant_access_token', return_value='token'):
+            with patch('tablemaster.feishu._get_bitable_fields', return_value={'a'}):
+                with patch(
+                    'tablemaster.feishu._request_with_retry',
+                    return_value=_DummyResponse({'code': 1001, 'msg': 'bad request'}),
+                ):
+                    with self.assertRaises(RuntimeError):
+                        fs_write_base(['app_token', 'table_id'], df, self.feishu_cfg)