pjdev-sqlmodel 4.1.0a3__tar.gz → 4.2.1__tar.gz

{pjdev_sqlmodel-4.1.0a3 → pjdev_sqlmodel-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pjdev-sqlmodel
-Version: 4.1.0a3
+Version: 4.2.1
 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.1.0a3 → pjdev_sqlmodel-4.2.1}/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.1.0a3"
+__version__ = "4.2.1"

{pjdev_sqlmodel-4.1.0a3 → pjdev_sqlmodel-4.2.1}/src/pjdev_sqlmodel/models/settings_models.py

@@ -54,5 +54,9 @@ class SqliteSettings(SqlModelSettings):
 
 
 class PostgresSettings(SqlModelSettings):
+    username: str
+    password: str
+    port: int = 5432
+
     def get_connection_string(self) -> str:
-        return f"postgresql+psycopg:///{self.host}.{self.db_name}"
+        return f"postgresql+psycopg://{self.username}:{self.password}@{self.host}:{self.port}/{self.db_name}"

{pjdev_sqlmodel-4.1.0a3 → pjdev_sqlmodel-4.2.1}/src/pjdev_sqlmodel/utilities.py

@@ -8,7 +8,6 @@ import pandas as pd
 from openpyxl.reader.excel import load_workbook
 from loguru import logger
 from sqlalchemy import Engine
-from sqlmodel import select
 
 from pjdev_sqlmodel import session_context, sqlmodel_service
 from pjdev_sqlmodel.models import ModelBase
@@ -16,14 +15,10 @@ from pjdev_sqlmodel.models import ModelBase
 T = TypeVar("T", bound=ModelBase)
 
 
-def get_files_in_directory(directory: Path, file_name='*', force_presence=False) -> List[Path]:
-    file_obj = [f for f in directory.glob(f"**/{file_name}.xlsx") if not f.name.startswith("~$")] + [
-        f for f in directory.glob(f"**/{file_name}.csv")
+def get_files_in_directory(directory: Path) -> List[Path]:
+    return [f for f in directory.glob("**/*.xlsx") if not f.name.startswith("~$")] + [
+        f for f in directory.glob("**/*.csv")
     ]
-    if force_presence and len(file_obj) == 0:
-        logger.error(f'Failed to find files matching the {directory}/{file_name} pattern and presence is required. Exiting...')
-        exit(1)
-    return file_obj
 
 
 def get_csv_columns(file_path):
@@ -172,75 +167,6 @@ def load_raw_excel_data(
     )
 
 
-def convert_table_to_df(InputTable: type[BaseModel]):
-    with session_context() as session:
-        statement = select(InputTable)
-        results = session.exec(statement).all()
-
-        headers = []
-        field_names = []
-        for name, annotation in InputTable.__annotations__.items():
-            field = InputTable.__fields__[name]
-            alias = field.alias if field.alias else name
-            headers.append(alias)
-            field_names.append(name)
-
-        data = []
-        for res in results:
-            new_obj = {}
-            for i in range(len(headers)):
-                header = headers[i]
-                field_name = field_names[i]
-                new_obj[header] = getattr(res, field_name)
-            data.append(new_obj)
-        df = pd.DataFrame(data)
-        return df
-
-
-def convert_table_to_csv(InputTable: type[BaseModel], file: Path):
-    df = convert_table_to_df(InputTable)
-    df.to_csv(file, index=False)
-
-
-def export_to_sheet(InputTable: type[BaseModel], wb: Workbook, sheet_name: str, table_name: str = None, hide_sheet=False):
-    df = convert_table_to_df(InputTable)
-    ws = wb.create_sheet(title=sheet_name)
-    if hide_sheet:
-        ws.sheet_state = 'hidden'
-
-    if table_name:
-        ws.merge_cells(start_row=1, start_column=1, end_row=1, end_column=len(df.columns))
-        cell = ws.cell(row=1, column=1)
-        cell.value = table_name
-        cell.font = Font(bold=True)
-        cell.alignment = Alignment(horizontal="center")
-        start_row = 2
-        ws.row_dimensions[1].height = 40.5
-        ws.row_dimensions[2].height = 30.75
-    else:
-        start_row = 1
-        ws.row_dimensions[1].height = 30.75
-
-    for r_idx, row in enumerate(dataframe_to_rows(df, index=False, header=True), start=start_row):
-        for c_idx, value in enumerate(row, start=1):
-            cell = ws.cell(row=r_idx, column=c_idx, value=value)
-            if r_idx == start_row:
-                cell.font = Font(bold=True)
-                cell.alignment = Alignment(horizontal="center")
-
-    for col_idx in range(1, len(df.columns) + 1):
-        column_letter = get_column_letter(col_idx)
-        max_length = 0
-        for cell in ws[column_letter]:
-            try:
-                if cell.value:
-                    max_length = max(max_length, len(str(cell.value)))
-            except:
-                pass
-        adjusted_width = (max_length + 2)
-        ws.column_dimensions[column_letter].width = adjusted_width
-
-
 def __read_csv(
     file: Path | str,
     cols: Optional[List[str]] = None,
@@ -282,4 +208,4 @@ def convert_to_csv(
     df = pd.DataFrame(dict_data)
 
     # Export DataFrame to CSV
-    df.to_csv(filename, index=index, columns=cols)
+    df.to_csv(filename, index=index, columns=cols)