tpltable 0.3.0__tar.gz → 0.3.2__tar.gz

{tpltable-0.3.0 → tpltable-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tpltable
-Version: 0.3.0
+Version: 0.3.2
 Summary: define "Excel" "Table|StyleTable" "Row|Col|StyleRow|StyleCol". Can dynamic modify excel data & styles. Support multiple kinds of indexes. (70%)
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

{tpltable-0.3.0 → tpltable-0.3.2}/setup.py

@@ -5,7 +5,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='tpltable',
-    version='0.3.0',
+    version='0.3.2',
     description='define "Excel" "Table|StyleTable" "Row|Col|StyleRow|StyleCol". Can dynamic modify excel data & styles. Support multiple kinds of indexes. (70%)',
     author_email='2229066748@qq.com',
     maintainer="Eagle'sBaby",

tpltable-0.3.2/tpltable/excel.py

@@ -0,0 +1,561 @@
+import numpy as np
+import pandas as pd
+from tpltable.table import *
+from tpltable.style import *
+
+
+class ListkeysDict(dict):
+    _DEFAULT_PREFIX = "NAME_"
+
+    def __init__(self, value=None, *, keys: list = None):
+        if value is None:
+            value = {}
+        super().__init__(value)
+        self._keys = list(super().keys())
+
+        if keys is not None:
+            for k in keys:
+                if k not in self:
+                    raise KeyError(f"Unknown key:{k} from custom keys")
+
+            for k in self:
+                if k not in keys:
+                    raise KeyError(f"Mising key:{k} from custom keys")
+
+            self._keys = list(keys)
+
+        self._last_key_number = 0
+
+    def _generate_key(self):
+        """生成一个唯一的键名，确保不与现有键冲突。"""
+        self._last_key_number += 1
+        key = f"{self._DEFAULT_PREFIX}{self._last_key_number}"
+        while key in self:
+            key = '_' + key
+        return key
+
+    def _get_keys(self, key) -> list:
+        try:
+            if isinstance(key, slice):
+                return self._keys[key]
+            elif isinstance(key, int):
+                return [self._keys[key]]
+            else:
+                return [key]
+        except IndexError:
+            raise KeyError(f"Key:{key} is out of bound.")
+
+    # Note: Dicts: ..........................................................................
+    def keys(self):
+        return self._keys.copy()
+
+    def values(self):
+        return [self[k] for k in self._keys]
+
+    def items(self):
+        return [(k, self[k]) for k in self._keys]
+
+    def get(self, key, default=None):
+        if isinstance(key, int):
+            key = self._keys[key]
+        elif isinstance(key, str):
+            key = key
+        else:
+            raise TypeError(f"unexpected key type:{type(key)}.")
+        return super().get(key, default)
+
+    def update(self, _m):
+        for k, v in _m.items():
+            if k not in self:
+                self._keys.append(k)
+            super().__setitem__(k, v)
+
+    @classmethod
+    def fromkeys(cls, keys, value=None):
+        return cls({k: value for k in keys})
+
+    def setdefault(self, __key, __default = None):
+        if __key not in self:
+            self._keys.append(__key)
+        return super().setdefault(__key, __default)
+
+    def popitem(self):
+        key = self._keys.pop()
+        return key, super().pop(key)
+
+
+    # Note: Lists: ..........................................................................
+
+    def append(self, value, *, key: str = None):
+        """在列表末尾添加元素。"""
+        if key is None:
+            key = self._generate_key()
+        if key in self:
+            raise KeyError(f"Repeat key: {key}")
+        self._keys.append(key)
+        super().__setitem__(key, value)
+
+    def extend(self, _m):
+        for k, v in _m.items():
+            if k not in self:
+                self._keys.append(k)
+            super().__setitem__(k, v)
+
+    def insert(self, index, value, *, key: str = None):
+        """在指定位置插入元素。"""
+        if index > len(self):
+            raise IndexError("Index out of range.")
+        if key is None:
+            key = self._generate_key()
+        if isinstance(index, str):
+            index = self._keys.index(index)
+
+        if key in self:
+            raise KeyError(f"Repeat key: {key}")
+
+        # self[key] = value
+        super().__setitem__(key, value)
+        self._keys.insert(index, key)
+
+
+    def index(self, value, start=0, stop=EMPTY_INDEX):
+        if stop is EMPTY_INDEX:
+            stop = len(self)
+        for i, k in enumerate(self._keys[start:stop]):
+            if self[k] == value:
+                return i
+        raise ValueError(f"{value} is not in listkeys_dict.")
+
+    def remove(self, value):
+        i = self.index(value)
+        super().__delitem__(self._keys[i])
+        self._keys.pop(i)
+
+    def reverse(self):
+        self._keys.reverse()
+
+    def sort(self, key=None, reverse=False):
+        if key is None:
+            key = lambda x: x
+        self._keys.sort(key=lambda x: key(super().__getitem__(x)), reverse=reverse)
+
+    def count(self, value):
+        return sum([1 for k in self._keys if super().__getitem__(k) == value])
+
+    # Note: Both Dicts & Lists: ..........................................................................
+    def pop(self, key, default=EMPTY_INDEX):
+        keys = self._get_keys(key)
+
+        for key in keys:
+            if default is EMPTY_INDEX:
+                return super().pop(key)
+            else:
+                return super().pop(key, default)
+
+
+    def clear(self):
+        self._keys.clear()
+        super().clear()
+
+    def copy(self):
+        return ListkeysDict(self, keys=self._keys.copy())
+
+
+    def __getitem__(self, key):
+        keys = self._get_keys(key)
+
+        _ret = []
+        for key in keys:
+            _ret.append(super().__getitem__(key))
+
+        if len(_ret) == 1:
+            return _ret[0]
+        return _ret
+
+    def __setitem__(self, key, value):
+        keys = self._get_keys(key)
+
+        for key in keys:
+            if key not in self:
+                self._keys.append(key)
+            super().__setitem__(key, value)
+
+    def __delitem__(self, key):
+        keys = self._get_keys(key)
+
+        for key in keys:
+            super().__delitem__(key)
+            self._keys.remove(key)
+
+    def __iter__(self):
+        return iter(self.keys())
+
+    def __len__(self):
+        return len(self._keys)
+
+
+    def __str__(self):
+        """提供字典内容的字符串表示。"""
+        txt = "{"
+        for i, (k, v) in enumerate(self.items()):
+            if isinstance(k, str):
+                k = f"'{k}'"
+            if isinstance(v, str):
+                v = f"'{v}'"
+
+            txt += f"{i}|{k}: {v}, "
+
+        if txt[-1] != '{':
+            txt = txt[:-2]
+
+        return txt + '}'
+
+    def __repr__(self):
+        return str(self)
+
+    # MATH
+    def __add__(self, other):
+        if isinstance(other, ListkeysDict):
+            return ListkeysDict({**self, **other})
+        return NotImplemented
+
+    def __radd__(self, other: dict):
+        other.update(self)
+        return other
+
+    def __iadd__(self, other):
+        self.update(other)
+        return self
+
+    def __sub__(self, other):
+        if isinstance(other, ListkeysDict):
+            return ListkeysDict({k: v for k, v in self.items() if k not in other})
+        return NotImplemented
+
+    def __rsub__(self, other: dict):
+        return {k: v for k, v in other.items() if k not in self}
+
+    def __isub__(self, other):
+        for k in other:
+            self.pop(k, None)
+        return self
+
+    def __mul__(self, other):
+        raise TypeError("unsupported operand type(s) for *: 'ListkeysDict' and 'int'")
+
+    def __rmul__(self, other):
+        raise TypeError("unsupported operand type(s) for *: 'int' and 'ListkeysDict'")
+
+    def __imul__(self, other):
+        raise TypeError("unsupported operand type(s) for *: 'ListkeysDict' and 'int'")
+
+    # COMPARE
+    def __eq__(self, other):
+        if isinstance(other, dict):
+            _items0, _items1 = self.items(), other.items()
+            return _items0 == _items1
+
+        return False
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __lt__(self, other):
+        raise TypeError("unorderable types: 'ListkeysDict' < 'ListkeysDict'")
+
+    def __le__(self, other):
+        raise TypeError("unorderable types: 'ListkeysDict' <= 'ListkeysDict'")
+
+    def __gt__(self, other):
+        raise TypeError("unorderable types: 'ListkeysDict' > 'ListkeysDict'")
+
+    def __ge__(self, other):
+        raise TypeError("unorderable types: 'ListkeysDict' >= 'ListkeysDict'")
+
+    # TYPE
+    def __bool__(self):
+        return bool(self._keys)
+
+    def __contains__(self, item):
+        return item in self._keys
+
+    def __hash__(self):
+        raise TypeError("unhashable type: 'ListkeysDict'")
+
+
+def test_listkeys_dict():
+    # 创建listkeys_dict实例
+    d = ListkeysDict()
+
+    # 测试append方法
+    d.append('apple')
+    d.append('banana')
+    print("After appends:", d)  # 应显示：['XXX1', 'XXX0'] = ['apple', 'banana']
+
+    # 测试getitem方法
+    print("Get item by int index 0:", d[0])  # 应显示：'XXX0'
+    print("Get item by int index 1:", d[1])  # 应显示：'XXX1'
+
+    # 测试setitem方法
+    d[1] = 'cherry'
+    print("After setting item 1 to 'cherry':", d)  # 应显示：['XXX0', 'XXX_XXX1'] = ['apple', 'cherry']
+
+    # 测试delitem方法
+    del d[0]
+    print("After deleting item 0:", d)  # 应显示：['XXX_XXX1'] = ['cherry']
+
+    # 测试insert方法
+    d.insert(0, 'date')
+    print("After inserting 'date' at index 0:", d)  # 应显示：['XXX2', 'XXX_XXX1'] = ['date', 'cherry']
+
+    # 测试迭代
+    print("Iterating over keys:", list(d))  # 应显示：['XXX2', 'XXX_XXX1']
+
+    # 测试长度
+    print("Length of d:", len(d))  # 应显示：2
+
+    # 测试切片
+    print("Slice of d:", d[0:2])  # 应显示：['XXX2', 'XXX_XXX1']
+
+    # 测试生成key
+    print("Generated key:", d._generate_key())  # 应显示一个唯一的key
+
+    # 测试异常处理
+    try:
+        d['nonexistent']
+    except KeyError as e:
+        print("Caught an exception:", e)
+
+    try:
+        del d[10]
+    except KeyError as e:
+        print("Caught an exception:", e)
+
+    try:
+        d[10] = 'mystery'
+    except KeyError as e:
+        print("Caught an exception:", e)
+
+
+class ExcelFileIOException(Exception):
+    pass
+
+
+class Excel(ListkeysDict):
+    def __init__(self, fpath: str = None, *, style: bool = True):
+        """
+        *Create an Excel object from an excel file or empty
+        :param fpath: excel file path. If None, will create an empty Excel object.
+        *
+        :param style: bool. If True, will load the style of the cell(may be cost). Default is True.
+        """
+        self._path = fpath
+        if self._path:
+            # try:
+            wb = load_workbook(fpath)
+            tbls = {sheet.title: self.__table_from_sheet(sheet, only_data=not style) for sheet in wb.worksheets}
+            wb.close()
+        # except Exception as e:
+        #     raise ExcelFileIOException("\n\nFatal to load excel file: \n" + reinsert_indent(str(e), '\t'))
+        else:
+            tbls = {}
+
+        super().__init__(tbls)
+
+    def __getitem__(self, item):
+        if isinstance(item, tuple):
+            _i0 = item[0]
+            item = item[1:] if len(item) >= 2 else None
+        else:
+            _i0 = item
+            item = None
+
+        if item is None:
+            return super().__getitem__(_i0)
+        return super().__getitem__(_i0)[item]
+
+    def __setitem__(self, key, value):
+        if isinstance(key, tuple):
+            _i0 = key[0]
+            item = key[1:] if len(key) >= 2 else None
+        else:
+            _i0 = key
+            key = None
+
+        if key is None:
+            assert isinstance(value, Table), f"Unexpected Table type:{value}"
+
+        if item is None:
+            super().__setitem__(_i0, value)
+            return
+        super().__getitem__(_i0)[item] = value
+
+    def __delitem__(self, key):
+        if isinstance(key, tuple):
+            _i0 = key[0]
+            key = key[1:] if len(key) >= 2 else None
+        else:
+            _i0 = key
+            key = None
+
+        super().__delitem__(key)
+
+    def __table_from_sheet(self, sheet: Worksheet, only_data: bool = False):
+        _construct_2d_list = []
+        _merges = [_merge.coord for _merge in sheet.merged_cells.ranges]
+
+        if only_data:
+            _styles = None
+            for row in sheet.iter_rows():
+                _construct_2d_list.append([cell.value if cell.value else NaN for cell in row])
+        else:
+            _styles = []
+            for row in sheet.iter_rows():
+                _construct_2d_list.append([cell.value if cell.value else NaN for cell in row])
+                _styles.append([Style(sheet, cell) for cell in row])
+
+        return Table(_construct_2d_list, _styles, _merges, copy=False)
+
+    @property
+    def path(self):
+        return self._path
+
+    @property
+    def tables(self):
+        return list(self.values())
+
+    @staticmethod
+    def __simple_str(string, max: int = 20):
+        string = str(string)
+        _len = len(string)
+        assert max > 4, "Max length should be greater than 4."
+        if _len > max:
+            _half = max // 2 - 1
+            return f"{string[:9]}...{string[_len - 9:]}"
+        return string
+
+    def __repr__(self):
+        return f"Excel({self.__simple_str(self._path)}|{len(self)} tables)"
+
+    def __str__(self):
+        _txt = f"Excel({self.__simple_str(self._path)}|{len(self)} tables)\t" + '{\n'
+        _MAX_SIZE = 16 - 2
+
+        # Max length key
+        keys = [k for k in self.keys()]
+        max_len_key = max([len(key) for key in keys])
+        _MAX_SIZE = min(_MAX_SIZE, max_len_key) + 2
+        max_len_key = max(max_len_key, _MAX_SIZE)
+
+        for name, tbl in self.items():
+            name = self.__simple_str(name, _MAX_SIZE)
+            _left_space = ' ' * (max_len_key - len(name))
+            _txt += f"\t'{name}'{_left_space}: {tbl.__repr__()},\n"
+        _txt += '}'
+        return _txt
+
+    def detail(self) -> str:
+        _txt = f"Excel({self.__simple_str(self._path)}|{len(self)} tables)\t" + '{\n'
+        _MAX_SIZE = 16 - 2
+
+        for name, tbl in self.items():
+            _sub_txt = color_string(f"\tTable '{name}'") + " >\n" + reinsert_indent(str(tbl), '\t\t')
+            _txt += _sub_txt + '\n\n'
+
+        if len(self) > 0:
+            _txt = _txt[:-1]
+        _txt += '}'
+
+        return _txt
+
+    def save(self, fpath: str = None, *, style: bool = True):
+        """
+        *Save the Excel object to an excel file.
+        :param fpath:
+        *
+        :param style: bool. If True, will save the style of the cell. Default is True.
+            NOTE: if use, will slower 20X and more
+        :return:
+        """
+        wb = Workbook()
+        for name, tbl in self.items():
+            ws = wb.create_sheet(name)
+            for row in tbl:
+                _row = []
+                for value in row:
+                    # if nan, set to None
+                    if isnan(value):
+                        _row.append(None)
+                    else:
+                        _row.append(value)
+                ws.append(_row)
+
+            # Merge
+            for merge in tbl.merges:
+                ws.merge_cells(f"{merge[0].letter}:{merge[1].letter}")
+
+            # Style
+            if style and tbl.styles is not None:
+                style_tbl = tbl.styles
+                for i, row in enumerate(ws.iter_rows()):
+                    for j, cell in enumerate(row):
+                        style_tbl[i][j].apply(ws, cell)
+
+        # remove the default sheet
+        wb.remove(wb.active)
+
+        if not fpath:
+            fpath = self._path
+        if not fpath:
+            raise ExcelFileIOException("\n\nNo file path defined: " + str(self))
+
+        try:
+            wb.save(fpath)
+        except Exception as e:
+            raise ExcelFileIOException("\n\nFatal to save excel file: \n" + reinsert_indent(str(e), '\t'))
+        wb.close()
+
+
+if __name__ == '__main__':
+    # test_listkeys_dict()
+    # exit()
+    # lk = ListkeysDict({'a': "Hello, ", 'b': "World"})
+    # print(lk['a'])
+    # print(lk)
+    # lk.append('你好!')
+    # print(lk)
+    # lk.insert(0, 'awa')
+    # print(lk)
+    # del lk[:2]
+    # print(lk)
+    #
+    # exit()
+    from ffre import FileFinder
+
+    fdir = r"C:\Users\22290\Desktop\20240504整理\tpltable 数据"
+    ff = FileFinder(fdir)
+    fpaths = list(ff.find(".xlsx"))
+
+    if not fpaths:
+        print("No excel file found.")
+        exit(0)
+
+    fp = fpaths[1]
+    _t = TimeRecorder()
+    for i in range(1):
+        excel = Excel(fp, style=False)
+    print("Load excel without style cost:", _t.dms(1), "ms")
+    _t.tick()
+    for i in range(1):
+        excel = Excel(fp, style=True)
+    print("Load excel with style cost:", _t.dms(1), "ms")
+
+    excel[0].styles['A1'][TYPE_COL_WIDTH] = 200
+
+    print(excel)
+    _t.tick()
+    excel.save("test.xlsx", style=False)
+    print("Save excel without style cost:", _t.dms(1), "ms")
+    _t.tick()
+    excel.save("test_style.xlsx", style=True)
+    print("Save excel with style cost:", _t.dms(1), "ms")

{tpltable-0.3.0 → tpltable-0.3.2}/tpltable/main.py

@@ -1,13 +1,8 @@
-from ffre import FileFinder, FCollect
 from tpltable.excel import Excel, Table
 from tpltable.style import *
-DIR_PATH = r"C:\Users\22290\Desktop\20240504整理\tpltable 数据"
 
-xlsx_paths:FCollect = FileFinder(DIR_PATH).find("xlsx", pattern=".+线$", exclude="^~")
+e = Excel()
 
-
-# e = Excel()
-#
 # t = e.append(Table(
 #     [[0],
 #     [4, 5, 6, 7],
@@ -22,15 +17,25 @@ xlsx_paths:FCollect = FileFinder(DIR_PATH).find("xlsx", pattern=".+线$", exclud
 # t.styles['A1'].set(TYPE_COL_WIDTH, 40)  # 设置列宽
 # t.styles[:, 1].set(TYPE_BCOLOR, COLOR_LIGHTGRAY)  # 设置浅灰色背景色
 # t.merge("A1:D1")  # 合并单元格
+#
+# print(S
+#     e.detail()
+# )
 
-e = Excel('test.xlsx')
-t = e[0]
+t = e.append(Table())
 
-del t['A']
+t.append(
+    [1, 2, 3, 4, 10],
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+)
 
-del t['B1', 'C2']
+t.merge('A1:F2')
+t.merge('E2:H3')
+print(t)
 
-e.save()
+e.save('test.xlsx')
 
 
 

{tpltable-0.3.0 → tpltable-0.3.2}/tpltable/table.py

@@ -409,7 +409,31 @@ class _ExcelIndexsLike_2DArray:
         return tuple()
 
     def __str__(self):
-        return self.__NAN_PAT.sub(self.__NAN_SUB_FN, str(self._df))
+        _values = self._df.values.tolist()
+        _values2 = []
+
+        # make sure each one is string
+        for i, _l in enumerate(_values):
+            _values[i] = [str(v) if not isnan(v) else "NaN" for v in _l]
+            _values2.append([f"({v})" if not isnan(v) else "NaN" for v in _l])
+
+        _cnd = np.array(_values)
+        _bracket_cdf = np.array(_values2)
+
+        # 将处于merge范围内的元素加上(), 除了第一个元素
+        _unhandled_mask = np.ones(self._df.shape, dtype=bool)
+        for lt, rb in self._merges:
+            _new_mask = np.zeros(self._df.shape, dtype=bool)
+            _new_mask[lt.ir:rb.ir + 1, lt.ic:rb.ic + 1] = _unhandled_mask[lt.ir:rb.ir + 1, lt.ic:rb.ic + 1]
+            _cnd[_new_mask] = _bracket_cdf[_new_mask]
+            # 把第一个元素还原
+            if _unhandled_mask[lt.ir, lt.ic]:
+                _cnd[lt.ir, lt.ic] = ':' + _cnd[lt.ir, lt.ic][1:]
+            _unhandled_mask[lt.ir:rb.ir + 1, lt.ic:rb.ic + 1] = False
+
+
+        return str(pd.DataFrame(_cnd, index=self._df.index, columns=self._df.columns, copy=False))
+
 
     def __repr__(self):
         c = Coord(self._df.shape[1] - 1, self._df.shape[0] - 1)
@@ -734,7 +758,12 @@ class _ExcelIndexsLike_2DArray:
 
     def _reindex(self):
         _2d_list = self._df.values.tolist()
-        self._df = self.__class__(_2d_list, *self._other_raws, copy=False)._df
+        self._reconstruct(_2d_list, *self._other_raws, copy=False)
+
+    def _reconstruct(self, *args, **kwargs):
+        new = self.__class__(*args, **kwargs)
+        self._df = new._df
+        return new
 
     def _enlarge(self, ir, ic, fill=np.nan):
         """
@@ -763,7 +792,7 @@ class _ExcelIndexsLike_2DArray:
         if ic >= sc:
             for _l in _2d_list:
                 _l.extend([fill] * (ic - sc))
-        self._df = self.__class__(_2d_list, *self._other_raws, copy=False)._df
+        self._reconstruct(_2d_list, *self._other_raws, copy=False)
 
     def __getitem__(self, key):
         """
@@ -819,7 +848,7 @@ class _ExcelIndexsLike_2DArray:
 
         if _i0 is None:  # None, None
             if isinstance(value, (int, float, str, bool)):
-                self._df = value
+                self._df.iloc[:, :] = value  # NOTE: 使用:,:来避免修改形状
                 return
             elif isinstance(value, list):
                 value = np.array(value)
@@ -832,7 +861,7 @@ class _ExcelIndexsLike_2DArray:
                 if value.shape == self._df.shape:
                     self._df.iloc[:, :] = value
                 else:
-                    self._df = self.__class__(value, *self._other_raws, copy=False)._df
+                    self._reconstruct(value, *self._other_raws, copy=False)
                 return
             else:
                 raise ValueError(f"Unsupported value type: {type(value)}")
@@ -865,7 +894,7 @@ class _ExcelIndexsLike_2DArray:
                     else:
                         raise ValueError(f"Unsupported value type: {type(value)}")
                     _2d_list = _2d_list[:_start] + _ + _2d_list[_start:]
-                    self._df = self.__class__(_2d_list, *self._other_raws, copy=False)._df
+                    self._reconstruct(_2d_list, *self._other_raws, copy=False)
                 return
             else:
                 raise ValueError(f"Unsupported value type: {type(value)}")
@@ -880,7 +909,7 @@ class _ExcelIndexsLike_2DArray:
         """
         _i0, _i1 = self._dim2_parse_index_key(key)
         if _i0 is None:
-            self._df = pd.DataFrame()
+            self._reconstruct(None, *self._other_raws)
             return
         elif _i1 is None:
             self._df.drop(self._df.index[_i0], inplace=True)
@@ -891,7 +920,7 @@ class _ExcelIndexsLike_2DArray:
             _is_i1_slice = isinstance(_i1, slice)
             if _is_i0_slice and _is_i1_slice:
                 if _i0.start is None and _i0.stop is None and _i1.start is None and _i1.stop is None:
-                    self._df = pd.DataFrame()
+                    self._reconstruct()
                 elif _i0.start is None and _i0.stop is None:
                     self._df.drop(self._df.columns[_i1], axis=1, inplace=True)
                     self._reindex()
@@ -911,6 +940,7 @@ class _ExcelIndexsLike_2DArray:
             else:
                 self._df.iloc[_i0, _i1] = np.nan
 
+
     def append(self, *values, axis=0):
         """
         Append Rows to the end of the table
@@ -925,14 +955,14 @@ class _ExcelIndexsLike_2DArray:
         else:
             for row in _construct:
                 row.extend(values)
-        self._df = self.__class__(_construct, *self._other_raws, copy=False)._df
+        self._reconstruct(_construct, *self._other_raws, copy=False)
 
     def clear(self):
         """
         Clear the table
         :return: None
         """
-        self._df = pd.DataFrame()
+        self._reconstruct(None, *self._other_raws)
 
     def copy(self):
         """
@@ -967,7 +997,7 @@ class _ExcelIndexsLike_2DArray:
 
         if _r == 0 or _c == 0:
             _construct = [[fill.copy() if _has_fill_copy else fill for _ in range(_new_c)] for _ in range(_new_r)]
-            self._df = self.__class__(_construct, *self._other_raws, copy=False)._df
+            self._reconstruct(_construct, *self._other_raws, copy=False)
             return
 
         # 先考虑扩张
@@ -978,9 +1008,9 @@ class _ExcelIndexsLike_2DArray:
 
         # 再考虑缩小 NOTE: 缩小不必考虑label的问题
         if _r > _new_r:
-            self._df = self._df.iloc[:_new_r]
+            self._reconstruct(self._df.iloc[:_new_r], *self._other_raws, copy=False)
         if _c > _new_c:
-            self._df = self._df.iloc[:, :_new_c]
+            self._reconstruct(self._df.iloc[:, :_new_c], *self._other_raws, copy=False)
 
 
     def __iter__(self):
@@ -1071,7 +1101,7 @@ class Table(_ExcelIndexsLike_2DArray):
     def merges(self):
         return self._merges
 
-    def merge(self, key:U[int, str, slice, Ellipsis, None], key1:U[int, str, slice, Ellipsis, None]=EMPTY_INDEX):
+    def merge(self, key:U[int, str, slice, None], key1:U[int, str, slice, None]=EMPTY_INDEX):
         if key1 is not EMPTY_INDEX:
             key = key, key1
 
@@ -1098,17 +1128,28 @@ class Table(_ExcelIndexsLike_2DArray):
                     lt, rb = Coord(_i1, _i0), Coord(_i1 - 1, _i0 - 1)
 
         # check whether the merge is out of the table
-        if lt.ir > ishape[1] or lt.ic > ishape[0]:
+        if lt.ir > ishape[0] or lt.ic > ishape[1]:
             return
 
-        if rb.ir > ishape[1]:
-            rb.ir = ishape[1]
+        if rb.ir > ishape[0]:
+            rb.ir = ishape[0]
 
-        if rb.ic > ishape[0]:
-            rb.ic = ishape[0]
+        if rb.ic > ishape[1]:
+            rb.ic = ishape[1]
 
         self._merges.append((lt, rb))
 
+    def _reconstruct(self, *args, **kwargs):
+        """
+        用于缩小或扩大表格时自动同步调整styles
+        :param args:
+        :param kwargs:
+        :return:
+        """
+        new = super()._reconstruct(*args, **kwargs)
+        self._styles = new._styles
+        return new
+
     def __delitem__(self, key):
         """
         Delete the value of the key
@@ -1117,11 +1158,12 @@ class Table(_ExcelIndexsLike_2DArray):
         """
         _i0, _i1 = self._dim2_parse_index_key(key)
         if _i0 is None:
-            self._df = pd.DataFrame()
+            self._reconstruct(None, *self._other_raws, copy=False)
             return
         elif _i1 is None:
             self._df.drop(self._df.index[_i0], inplace=True)
-            self._styles.drop(self._styles.index[_i0], inplace=True)
+            self._styles._df.drop(self._styles._df.index[_i0], inplace=True)
+            self._remerge('dr', _i0)
             self._reindex()
             return
         else:
@@ -1129,26 +1171,84 @@ class Table(_ExcelIndexsLike_2DArray):
             _is_i1_slice = isinstance(_i1, slice)
             if _is_i0_slice and _is_i1_slice:
                 if _i0.start is None and _i0.stop is None and _i1.start is None and _i1.stop is None:
-                    self._df = pd.DataFrame()
+                    self._reconstruct(None, *self._other_raws, copy=False)
                 elif _i0.start is None and _i0.stop is None:
                     self._df.drop(self._df.columns[_i1], axis=1, inplace=True)
+                    self._styles._df.drop(self._styles._df.columns[_i1], axis=1, inplace=True)
+                    self._remerge('dc', _i1)
                     self._reindex()
                 elif _i1.start is None and _i1.stop is None:
                     self._df.drop(self._df.index[_i0], inplace=True)
+                    self._styles._df.drop(self._styles._df.index[_i0], inplace=True)
+                    self._remerge('dr', _i0)
                     self._reindex()
                 else:  # 删除一片区域为nan
                     self._df.iloc[_i0, _i1] = np.nan
             elif _is_i0_slice and _i0.start is None and _i0.stop is None:
                 self._df.drop(self._df.columns[_i1], axis=1, inplace=True)
+                self._styles._df.drop(self._styles._df.columns[_i1], axis=1, inplace=True)
+                self._remerge('dc', _i1)
                 self._reindex()
                 return
             elif _is_i1_slice and _i1.start is None and _i1.stop is None:
                 self._df.drop(self._df.index[_i0], inplace=True)
+                self._styles._df.drop(self._styles._df.index[_i0], inplace=True)
+                self._remerge('dr', _i0)
                 self._reindex()
                 return
             else:
                 self._df.iloc[_i0, _i1] = np.nan
 
+    def _remerge(self, op_type, value):
+        """
+        重新调整合并区域
+        :param op_type: 'a'|'d'+'r'|'c'  表示增加行、删除行、增加列、删除列
+        :param value: 对应的索引值，可以是int或slice
+        :return: None
+        """
+        assert len(op_type) == 2, f"Invalid op_type: {op_type}"
+        op, tar = op_type
+        assert op in 'ad' and tar in 'rc', f"Invalid op_type: {op_type}"
+
+        # 将int转为slice
+        if isinstance(value, int):
+            value = slice(value, value + 1)
+        elif not isinstance(value, slice):
+            raise ValueError(f"Unsupported re_merge value type: {type(value)}")
+        _removes = []
+        if tar == 'r':
+            for i, (lt, rb) in enumerate(self._merges.copy()):
+                if op == 'a':
+                    if lt.ir >= value.start:
+                        lt.ir += value.stop - value.start
+                    if rb.ir >= value.start:
+                        rb.ir += value.stop - value.start
+                else:
+                    if lt.ir >= value.start:
+                        lt.ir -= value.stop - value.start
+                    if rb.ir >= value.start:
+                        rb.ir -= value.stop - value.start
+                if lt.ir == rb.ir:
+                    _removes.append(i)
+                # else:  NOTE: 无需赋值, 只是浅拷贝
+                #     self._merges[i] = (lt, rb)
+        else:
+            for i, (lt, rb) in enumerate(self._merges.copy()):
+                if op == 'a':
+                    if lt.ic >= value.start:
+                        lt.ic += value.stop - value.start
+                    if rb.ic >= value.start:
+                        rb.ic += value.stop - value.start
+                else:
+                    if lt.ic >= value.start:
+                        lt.ic -= value.stop - value.start
+                    if rb.ic >= value.start:
+                        rb.ic -= value.stop - value.start
+                if lt.ic == rb.ic:
+                    _removes.append(i)
+                # else:  NOTE: 无需赋值, 只是浅拷贝
+                #     self._merges[i] = (lt, rb)
+
 
 def __1d_test(_print=True):
     d = [1, 2, 3, 4, 5]

{tpltable-0.3.0 → tpltable-0.3.2}/tpltable.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tpltable
-Version: 0.3.0
+Version: 0.3.2
 Summary: define "Excel" "Table|StyleTable" "Row|Col|StyleRow|StyleCol". Can dynamic modify excel data & styles. Support multiple kinds of indexes. (70%)
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

tpltable-0.3.0/tpltable/excel.py

@@ -1,208 +0,0 @@
-import numpy as np
-import pandas as pd
-from tpltable.table import *
-from tpltable.style import *
-
-class ExcelFileIOException(Exception):
-    pass
-
-class Excel(dict):
-    def __init__(self, fpath:str=None, *, style:bool=True):
-        """
-        *Create an Excel object from an excel file or empty
-        :param fpath: excel file path. If None, will create an empty Excel object.
-        *
-        :param style: bool. If True, will load the style of the cell(may be cost). Default is True.
-        """
-        self._path = fpath
-        if self._path:
-            # try:
-                wb = load_workbook(fpath)
-                tbls = {sheet.title: self.__table_from_sheet(sheet, only_data=not style) for sheet in wb.worksheets}
-                wb.close()
-            # except Exception as e:
-            #     raise ExcelFileIOException("\n\nFatal to load excel file: \n" + reinsert_indent(str(e), '\t'))
-        else:
-            tbls = {}
-
-        super().__init__(tbls)
-
-        # 添加数字索引
-        self.numbers = {i: tbl for i, (name, tbl) in enumerate(tbls.items())}
-
-    def __getitem__(self, item):
-        if isinstance(item, int):
-            return self.numbers[item]
-        return super().__getitem__(item)
-
-    def __setitem__(self, key, value):
-        if isinstance(key, int):
-            key = list(self.keys())[key]
-        super().__setitem__(key, value)
-
-    def __delitem__(self, key):
-        if isinstance(key, int):
-            key = list(self.keys())[key]
-            del self.numbers[key]
-        super().__delitem__(key)
-
-
-    def __table_from_sheet(self, sheet:Worksheet, only_data:bool=False):
-        _construct_2d_list = []
-        _merges = [_merge.coord for _merge in sheet.merged_cells.ranges]
-
-        if only_data:
-            _styles = None
-            for row in sheet.iter_rows():
-                _construct_2d_list.append([cell.value if cell.value else NaN for cell in row])
-        else:
-            _styles = []
-            for row in sheet.iter_rows():
-                _construct_2d_list.append([cell.value if cell.value else NaN for cell in row])
-                _styles.append([Style(sheet, cell) for cell in row])
-
-
-        return Table(_construct_2d_list, _styles, _merges, copy=False)
-
-    @property
-    def path(self):
-        return self._path
-
-    @property
-    def tables(self):
-        return list(self.values())
-
-    @staticmethod
-    def __simple_str(string, max:int=20):
-        _len = len(string)
-        assert max > 4, "Max length should be greater than 4."
-        if _len > max:
-            _half = max // 2 - 1
-            return f"{string[:9]}...{string[_len-9:]}"
-        return string
-
-    def __repr__(self):
-        return f"Excel({self.__simple_str(self._path)}|{len(self)} tables)"
-
-    def __str__(self):
-        _txt = f"Excel({self.__simple_str(self._path)}|{len(self)} tables)\t" + '{\n'
-        _MAX_SIZE = 16 - 2
-
-        # Max length key
-        keys = [k for k in self.keys()]
-        max_len_key = max([len(key) for key in keys])
-        _MAX_SIZE = min(_MAX_SIZE, max_len_key) + 2
-        max_len_key = max(max_len_key, _MAX_SIZE)
-
-        for name, tbl in self.items():
-            name = self.__simple_str(name, _MAX_SIZE)
-            _left_space = ' ' * (max_len_key - len(name))
-            _txt += f"\t'{name}'{_left_space}: {tbl.__repr__()},\n"
-        _txt += '}'
-        return _txt
-
-    def append(self, tbl:Table, name:str=None):
-        if name is None:
-            name = f"sheet{len(self)}"
-            while name in self:
-                name = '_' + name
-        self.numbers[len(self)] = tbl
-        self[name] = tbl
-        return tbl
-
-
-    def detail(self) -> str:
-        _txt = f"Excel({self.__simple_str(self._path)}|{len(self)} tables)\t" + '{\n'
-        _MAX_SIZE = 16 - 2
-
-        for name, tbl in self.items():
-            _sub_txt = color_string(f"\tTable '{name}'") + " >\n" + reinsert_indent(str(tbl), '\t\t')
-            _txt += _sub_txt + '\n\n'
-
-        if len(self) > 0:
-            _txt = _txt[:-1]
-        _txt += '}'
-
-        return _txt
-
-    def save(self, fpath:str=None, *, style:bool=True):
-        """
-        *Save the Excel object to an excel file.
-        :param fpath:
-        *
-        :param style: bool. If True, will save the style of the cell. Default is True.
-            NOTE: if use, will slower 20X and more
-        :return:
-        """
-        wb = Workbook()
-        for name, tbl in self.items():
-            ws = wb.create_sheet(name)
-            for row in tbl:
-                _row = []
-                for value in row:
-                    # if nan, set to None
-                    if isnan(value):
-                        _row.append(None)
-                    else:
-                        _row.append(value)
-                ws.append(_row)
-
-            # Merge
-            for merge in tbl.merges:
-                ws.merge_cells(f"{merge[0].letter}:{merge[1].letter}")
-
-            # Style
-            if style and tbl.styles is not None:
-                style_tbl = tbl.styles
-                for i, row in enumerate(ws.iter_rows()):
-                    for j, cell in enumerate(row):
-                        style_tbl[i][j].apply(ws, cell)
-
-        # remove the default sheet
-        wb.remove(wb.active)
-
-        if not fpath:
-            fpath = self._path
-        if not fpath:
-            raise ExcelFileIOException("\n\nNo file path defined: " + str(self))
-
-        try:
-            wb.save(fpath)
-        except Exception as e:
-            raise ExcelFileIOException("\n\nFatal to save excel file: \n" + reinsert_indent(str(e), '\t'))
-        wb.close()
-
-
-if __name__ == '__main__':
-    from ffre import FileFinder
-    fdir = r"C:\Users\22290\Desktop\20240504整理\tpltable 数据"
-    ff = FileFinder(fdir)
-    fpaths = list(ff.find(".xlsx"))
-
-    if not fpaths:
-        print("No excel file found.")
-        exit(0)
-
-    fp = fpaths[1]
-    _t = TimeRecorder()
-    for i in range(1):
-        excel = Excel(fp, style=False)
-    print("Load excel without style cost:", _t.dms(1), "ms")
-    _t.tick()
-    for i in range(1):
-        excel = Excel(fp, style=True)
-    print("Load excel with style cost:", _t.dms(1), "ms")
-
-    excel[0].styles['A1'][TYPE_COL_WIDTH] = 200
-
-    print(excel)
-    _t.tick()
-    excel.save("test.xlsx", style=False)
-    print("Save excel without style cost:", _t.dms(1), "ms")
-    _t.tick()
-    excel.save("test_style.xlsx", style=True)
-    print("Save excel with style cost:", _t.dms(1), "ms")
-
-
-
-