pjdev-sqlmodel 0.0.1a4__tar.gz → 3.4.2__tar.gz

{pjdev_sqlmodel-0.0.1a4 → pjdev_sqlmodel-3.4.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.3
 Name: pjdev-sqlmodel
-Version: 0.0.1a4
-Project-URL: Documentation, https://gitlab.purplejay.net/keystone/python/-/tree/main/pjdev-sqlmodel#readme
+Version: 3.4.2
+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
-Author-email: Purple Jay LLC <app-support@purplejay.io>
+Author-email: Purple Jay LLC <apps+keystone-python-221-issue-@purplejay.io>
 License-Expression: MIT
 License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta

{pjdev_sqlmodel-0.0.1a4 → pjdev_sqlmodel-3.4.2}/pyproject.toml

@@ -11,7 +11,7 @@ requires-python = ">=3.12"
 license = "MIT"
 keywords = []
 authors = [
-  { name = "Purple Jay LLC", email = "app-support@purplejay.io" },
+  { name = "Purple Jay LLC", email = "apps+keystone-python-221-issue-@purplejay.io" },
 ]
 classifiers = [
   "Development Status :: 4 - Beta",
@@ -29,7 +29,7 @@ dependencies = [
 ]
 
 [project.urls]
-Documentation = "https://gitlab.purplejay.net/keystone/python/-/tree/main/pjdev-sqlmodel#readme"
+Documentation = "https://gitlab.purplejay.net/keystone/python"
 Issues = "https://gitlab.purplejay.net/keystone/python/issues"
 Source = "https://gitlab.purplejay.net/keystone/python"
 

pjdev_sqlmodel-0.0.1a4/tests/__init__.py → pjdev_sqlmodel-3.4.2/src/pjdev_sqlmodel/__about__.py

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

pjdev_sqlmodel-0.0.1a4/src/pjdev_sqlmodel/__about__.py → pjdev_sqlmodel-3.4.2/src/pjdev_sqlmodel/__init__.py

@@ -1,4 +1,7 @@
 # SPDX-FileCopyrightText: 2024-present Chris O'Neill <chris@purplejay.io>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.0.1a4"
+
+from loguru import logger
+
+logger.disable("pjdev_sqlmodel")

pjdev_sqlmodel-3.4.2/src/pjdev_sqlmodel/db_models.py

@@ -0,0 +1,12 @@
+from typing import Optional
+
+from pydantic import ConfigDict
+from sqlmodel import SQLModel, Field as SqlField
+
+
+class ModelBase(SQLModel):
+    model_config = ConfigDict(extra="ignore", populate_by_name=True)
+
+
+class TableModel(ModelBase):
+    row_id: Optional[int] = SqlField(default=None, primary_key=True)

{pjdev_sqlmodel-0.0.1a4 → pjdev_sqlmodel-3.4.2}/src/pjdev_sqlmodel/service.py

@@ -6,8 +6,9 @@ from typing import (
 )
 
 from sqlalchemy import Engine, NullPool
-from sqlmodel import SQLModel, create_engine, Session as SQLModelSession
+from sqlmodel import create_engine, Session as SQLModelSession
 
+from pjdev_sqlmodel.db_models import ModelBase
 from pjdev_sqlmodel.settings import SqlModelSettings
 
 
@@ -21,7 +22,7 @@ __ctx = DBContext()
 
 def initialize_engine(
     settings: SqlModelSettings,
-    tables: List[Type[SQLModel]],
+    tables: List[Type[ModelBase]],
     echo: bool = False,
 ) -> Engine:
     if len(tables) == 0:
@@ -37,7 +38,7 @@ def initialize_engine(
     return engine
 
 
-def configure_single_context(settings: SqlModelSettings, tables: List[Type[SQLModel]]):
+def configure_single_context(settings: SqlModelSettings, tables: List[Type[ModelBase]]):
     __ctx.engine = initialize_engine(settings, tables)
 
 

{pjdev_sqlmodel-0.0.1a4 → pjdev_sqlmodel-3.4.2}/src/pjdev_sqlmodel/utilities.py

@@ -4,14 +4,14 @@ from pathlib import Path
 from typing import Type, TypeVar, List, Optional, Tuple, Dict
 
 from pydantic import ValidationError, BaseModel
-from sqlmodel import SQLModel
 import pandas as pd
 from openpyxl.reader.excel import load_workbook
 from loguru import logger
 
+from pjdev_sqlmodel.db_models import ModelBase
 from pjdev_sqlmodel.service import session_context
 
-T = TypeVar("T", bound=SQLModel)
+T = TypeVar("T", bound=ModelBase)
 
 
 def get_files_in_directory(directory: Path) -> List[Path]: