wassname/greater_tables_project
1
0
Fork 0
mirror of https://github.com/wassname/greater_tables_project.git synced 2026-06-27 17:48:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

3.1.0 combating auto format

Browse Source
This commit is contained in:
Stephen Mildenhall
2025-06-14 20:28:31 +01:00
parent 640e944b5e
commit 0032cd9c00
1 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
greater_tables/gtcore.py
+6 -32
View File
@@ -256,8 +256,8 @@ class GT(object):
raw = yaml.safe_load(config_path.read_text(encoding="utf-8")) raw = yaml.safe_load(config_path.read_text(encoding="utf-8"))
base_config = GTConfigModel.model_validate(raw) base_config = GTConfigModel.model_validate(raw)
except (ValidationError, OSError) as e: except (ValidationError, OSError) as e:
raise ValueError(f"Failed to load config from { raise ValueError(
config_path}") from e f"Failed to load config from {config_path}") from e
else: else:
base_config = GTConfigModel() base_config = GTConfigModel()
@@ -697,32 +697,6 @@ class GT(object):
"""Formatter for columns flagged as raw.""" """Formatter for columns flagged as raw."""
return str(x) return str(x)
# def config.default_formatter(self, x):
# """Universal formatter for other types."""
# try:
# # werid wrinkle here: float('infinity') -> np.inf!!
# f = float(x)
# if self.default_float_formatter:
# return self.default_float_formatter(f)
# try:
# i = int(x)
# except ValueError:
# try:
# i = int(f)
# except OverflowError:
# # this came up! Passed the work "Infinity"
# return str(x)
# if i == f:
# return self.config.default_integer_str.format(x=i)
# else:
# # TODO BEEF UP?
# return self.config.default_float_str.format(x=f)
# except (TypeError, ValueError):
# if self.config.max_str_length < 0:
# return str(x)
# else:
# return str(x)[:self.config.max_str_length]
def default_formatter(self, x): def default_formatter(self, x):
"""Default universal formatter for other types (GTP re-write of above cluster).""" """Default universal formatter for other types (GTP re-write of above cluster)."""
try: try:
@@ -934,8 +908,8 @@ class GT(object):
# target width INCLUDES padding and column marks | # target width INCLUDES padding and column marks |
target_width = self.config.max_table_width - \ target_width = self.config.max_table_width - \
(PADDING + 1) * n_col - 1 (PADDING + 1) * n_col - 1
logger.info(f'Col padding effect { logger.info(f'Col padding effect {self.config.max_table_width=}'
self.config.max_table_width=} ==> {target_width=}') f' ==> {target_width=}')
elif self.config.table_width_mode == 'natural': elif self.config.table_width_mode == 'natural':
target_width = natural + (PADDING + 1) * n_col + 1 target_width = natural + (PADDING + 1) * n_col + 1
elif self.config.table_width_mode == 'breakable': elif self.config.table_width_mode == 'breakable':
@@ -2049,8 +2023,8 @@ class GT(object):
if i == 1: if i == 1:
# first column sets row height for entire row # first column sets row height for entire row
sio.write(f'\tcolumn {i:>2d}/.style={{' sio.write(f'\tcolumn {i:>2d}/.style={{'
f'nodes={{align={ f'nodes={{align={ad[al]:<6s}}}, '
ad[al]:<6s}}}, text height=0.9em, text depth=0.2em, ' 'text height=0.9em, text depth=0.2em, '
f'inner xsep={column_sep}em, inner ysep=0, ' f'inner xsep={column_sep}em, inner ysep=0, '
f'text width={max(2, 0.6 * w):.2f}em}},\n') f'text width={max(2, 0.6 * w):.2f}em}},\n')
else: else: