pjdev-sqlmodel 4.3.2__tar.gz → 4.3.4__tar.gz

{pjdev_sqlmodel-4.3.2 → pjdev_sqlmodel-4.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pjdev-sqlmodel
-Version: 4.3.2
+Version: 4.3.4
 Project-URL: Documentation, https://gitlab.purplejay.net/keystone/python
 Project-URL: Issues, https://gitlab.purplejay.net/keystone/python/issues
 Project-URL: Source, https://gitlab.purplejay.net/keystone/python

{pjdev_sqlmodel-4.3.2 → pjdev_sqlmodel-4.3.4}/src/pjdev_sqlmodel/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Chris O'Neill <chris@purplejay.io>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "4.3.2"
+__version__ = "4.3.4"

{pjdev_sqlmodel-4.3.2 → pjdev_sqlmodel-4.3.4}/src/pjdev_sqlmodel/utilities.py

@@ -3,6 +3,10 @@ import warnings
 from pathlib import Path
 from typing import Type, TypeVar, List, Optional, Tuple, Dict
 
+from openpyxl.styles import Font, Alignment
+from openpyxl.utils import get_column_letter
+from openpyxl.utils.dataframe import dataframe_to_rows
+from openpyxl.workbook import Workbook
 from pydantic import ValidationError, BaseModel
 import pandas as pd
 from openpyxl.reader.excel import load_workbook
@@ -34,12 +38,14 @@ def get_csv_columns(file_path):
         return header
 
 
-def get_excel_columns(file_path, header_ndx: int = 1, col_range: Optional[str] = None):
+def get_excel_columns(file_path, header_ndx: int = 1, col_range: Optional[str] = None, sheet_name: str | int = 0):
     with warnings.catch_warnings():
         warnings.filterwarnings("ignore")
         wb = load_workbook(filename=file_path, read_only=True)
 
-    sheet = wb.active
+
+    # TODO: need to ensure that sending an int will work
+    sheet = wb[sheet_name] if sheet_name else wb.active
 
     if col_range is not None:
         return [c.value for c in [row for row in sheet[col_range]][0]]
@@ -95,7 +101,7 @@ def load_excel_data(
         for f in data_files
         if f.name.endswith(".xlsx")
            and len(
-            set(cols).difference(set(get_excel_columns(f, header_ndx + 1, col_range)))
+            set(cols).difference(set(get_excel_columns(f, header_ndx + 1, col_range, sheet_name=sheet_name)))
         )
            == 0
     ]