From af6d214e5aab0b51a4fe1437b5a036e6b79e730d Mon Sep 17 00:00:00 2001 From: Joshua Lucas Date: Thu, 5 Nov 2026 22:02:10 -0600 Subject: [PATCH] Fix path construction in Converter.to_file. --- src/AuDaGe/converter.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/AuDaGe/converter.py b/src/AuDaGe/converter.py index 5f894ee..db483c5 100644 --- a/src/AuDaGe/converter.py +++ b/src/AuDaGe/converter.py @@ -16,7 +16,8 @@ from collections.abc import Callable, Collection from copy import deepcopy from enum import StrEnum, auto from importlib import resources -from os import PathLike, path +from os import PathLike +from pathlib import Path from typing import Any import jsonschema @@ -24,9 +25,8 @@ import pandas as pd import yaml from numpy import nan -import assets import AuDaGe -from AuDaGe import iec +from AuDaGe import assets, iec from AuDaGe.formats.controlexpert.xsy import XSYReader from AuDaGe.frame import AuDaGeFrame, Frame @@ -294,15 +294,23 @@ class Converter: def to_file(self, frame: Frame, file_path: PathLike | str): write_map: dict[str, Callable] = { - "csv": frame.to_csv, - "xml": frame.to_xml, - "xlsx": frame.to_excel, + "csv": lambda path, **kwargs: frame.to_csv( + path, index=False, **kwargs + ), + "xml": lambda path, **kwargs: frame.to_xml( + path, index=False, **kwargs + ), + "xlsx": lambda path, **kwargs: frame.to_excel( + path, index=False, **kwargs + ), "xsy": XSYReader().write, } format = deepcopy(self.spec[YN.FORMAT]) if isinstance(format, str): format_kwargs = {} - write = write_map[self.spec[YN.FORMAT]] + format_name = self.spec[YN.FORMAT] + write = write_map[format_name] + format_ext = format_name else: format_name = format.pop(YN.NAME) try: @@ -319,8 +327,9 @@ class Converter: export_kwargs = {} format_kwargs = format | export_kwargs write = write_map[format_name] + format_ext = f".{format_ext.lstrip('.')}" write( - ".".join((path.splitext(file_path)[0], format_ext)), + Path(file_path).with_suffix(format_ext), **format_kwargs, )