fastapi-sqlalchemy-ease 0.1.4__tar.gz → 0.1.5__tar.gz

{fastapi_sqlalchemy_ease-0.1.4 → fastapi_sqlalchemy_ease-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-sqlalchemy-ease
-Version: 0.1.4
+Version: 0.1.5
 Summary: A reusable SQLAlchemy extension for FastAPI
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown

{fastapi_sqlalchemy_ease-0.1.4 → fastapi_sqlalchemy_ease-0.1.5}/fastapi_sqlalchemy_ease/__init__.py

@@ -1,7 +1,7 @@
 from .core import SQLAlchemy
 from .exceptions import DatabaseError, DatabaseNotInitializedError
 
-__version__='0.1.4'
+__version__='0.1.5'
 
 # when someone call: from fastapi_sqlalchemy import SQLAlchemy
 # only these things are available

{fastapi_sqlalchemy_ease-0.1.4 → fastapi_sqlalchemy_ease-0.1.5}/fastapi_sqlalchemy_ease/core.py

@@ -6,7 +6,8 @@ from sqlalchemy import (
     Numeric,
     ForeignKey,
     UniqueConstraint, CheckConstraint,
-    Index, Table
+    Index, Table,
+    func, and_, any_, not_, or_, select, update, delete, desc, asc
 )
 from sqlalchemy.orm import declarative_base, sessionmaker, Session, relationship
 from typing import Generator, Optional
@@ -32,6 +33,24 @@ class SQLAlchemy:
     LargeBinary = LargeBinary
     Numeric = Numeric
 
+    '''Logic and Boolean operators'''
+    and_ = and_
+    or_ = or_
+    not_ = not_
+
+    '''SQL Functions (count, now, max, min, etc.)'''
+    func = func
+
+    '''Query Execution Utilities'''
+    select = select
+    update = update
+    delete = delete
+
+    '''ordering'''
+    desc = desc
+    asc = asc
+
+
     '''Relationships and Constraints'''
     ForeignKey = ForeignKey
     UniqueConstraint = UniqueConstraint
@@ -43,18 +62,21 @@ class SQLAlchemy:
     def __new__(cls):
         if cls._instance is None:
             cls._instance = super().__new__(cls)
+            cls._instance._Model = declarative_base()
         return cls._instance
     
 
     def __init__(self):
-        # Everything starts as None Until db.init_app() is called
-        self.engine = None
-        self._SessionLocal = None
-        self._Model = None
-        self._initialized = False
+        if not hasattr(self, '_initialized_vars'):
+            # Everything starts as None Until db.init_app() is called
+            self.engine = None
+            self._SessionLocal = None
+            self.session = None 
+            self._initialized = False
+            self._initialized_vars = True
 
 
-    def init_app(self, DATABASE_URI: str, connect_args: Optional[dict]=None):
+    def init_app(self, DATABASE_URI: str, **kwargs):
         '''
         Docstring for init_app
         
@@ -64,12 +86,16 @@ class SQLAlchemy:
         connect_args: used only when initializing sqlite db
         '''
 
-        engine_kwargs={}
+        engine_kwargs={
+            "pool_pre_ping": True,
+        }
 
-        if connect_args:
-            engine_kwargs['connect_args'] = connect_args # sqlite need this
-        else:
-            engine_kwargs['pool_pre_ping'] = True # Keeps connection alive for PostgreSQL/MySQL
+        # Only add pooling if NOT using SQLite
+        if not DATABASE_URI.startswith("sqlite"):
+            engine_kwargs["pool_size"] = kwargs.get("pool_size", 10)
+            engine_kwargs["max_overflow"] = kwargs.get("max_overflow", 20)
+
+        engine_kwargs.update(kwargs)
 
         # Engine connection to database
         self.engine = create_engine(DATABASE_URI, **engine_kwargs)
@@ -77,8 +103,9 @@ class SQLAlchemy:
         # SessionLocal - Factory data creates new sessions
         self._SessionLocal = sessionmaker(autoflush=False ,bind=self.engine)
 
-        # Model - base class, all our database models will inherit from
-        self._Model = declarative_base()
+        from sqlalchemy.orm import scoped_session
+        self.session = scoped_session(self._SessionLocal)
+        self._Model.query = self.session.query_property()
 
         self._initialized = True
 
@@ -91,9 +118,6 @@ class SQLAlchemy:
         Base class for creating database models
         User writes: class User(db.Model):
         '''
-
-        if not self._initialized:
-            raise DatabaseNotInitializedError('Database not Intialized, call db.init_app() first.')
         
         return self._Model
     
@@ -136,8 +160,8 @@ class SQLAlchemy:
         if not self._initialized:
             raise DatabaseNotInitializedError('Database not Intialized, call db.init_app() first.')
             
-        session = self._SessionLocal()
+        session = self.session()
         try:
             yield session # Give session to the route
         finally:
-            session.close() #always close after one requst
+            self.session.remove() #proper cleanup for scoped sessions

{fastapi_sqlalchemy_ease-0.1.4 → fastapi_sqlalchemy_ease-0.1.5}/fastapi_sqlalchemy_ease.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-sqlalchemy-ease
-Version: 0.1.4
+Version: 0.1.5
 Summary: A reusable SQLAlchemy extension for FastAPI
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown

{fastapi_sqlalchemy_ease-0.1.4 → fastapi_sqlalchemy_ease-0.1.5}/setup.py

@@ -7,7 +7,7 @@ long_description = (this_directory / "README.md").read_text()
 
 setup(
     name='fastapi-sqlalchemy-ease',
-    version='0.1.4',
+    version='0.1.5',
     description="A reusable SQLAlchemy extension for FastAPI",
     packages=find_packages(),
     long_description=long_description,