Finished refactoring.

api/model/__init__.py

@@ -0,0 +1,31 @@
+from contextlib import contextmanager
+from flask.ext.sqlalchemy import SQLAlchemy
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import scoped_session, sessionmaker
+
+db = SQLAlchemy()
+
+@contextmanager
+def session_scope(engine):
+    if engine:
+        session = scoped_session(sessionmaker(autocommit = False, autoflush = False, bind = engine))
+        #Base.query = session.query_property()
+
+        try:
+            yield session
+            session.commit()
+        except:
+            session.rollback()
+            raise
+        finally:
+            session.close()
+
+import pkgutil
+
+__all__ = []
+
+for loader, module_name, is_pkg in pkgutil.walk_packages(__path__):
+    __all__.append(module_name)
+
+from . import *
+

api/model/accounts.py

@@ -14,8 +14,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with Accountant.  If not, see <http://www.gnu.org/licenses/>.
 """
-from app import app
-from app import db
+from . import db
 
 class Account(db.Model):
     id = db.Column(db.Integer, primary_key = True)

api/model/entries.py

@@ -14,12 +14,9 @@
     You should have received a copy of the GNU Affero General Public License
     along with Accountant.  If not, see <http://www.gnu.org/licenses/>.
 """
-from app import app
-from app import db
-
-from api.model.accounts import Account
-from api.model.scheduled_operations import ScheduledOperation
-
+from . import db
+from .accounts import Account
+from .scheduled_operations import ScheduledOperation
 from sqlalchemy import func, desc
 from sqlalchemy.orm import column_property
 from sqlalchemy.sql import func, select

api/model/operations.py

@@ -14,11 +14,10 @@
     You should have received a copy of the GNU Affero General Public License
     along with Accountant.  If not, see <http://www.gnu.org/licenses/>.
 """
-from app import app
-from app import db
+from . import db
 
-from api.model.accounts import Account
-from api.model.scheduled_operations import ScheduledOperation
+from .accounts import Account
+from .scheduled_operations import ScheduledOperation
 
 from sqlalchemy import func, desc
 from sqlalchemy.orm import column_property

api/model/scheduled_operations.py

@@ -1,8 +1,5 @@
-from app import app
-from app import db
-
-from api.model.accounts import Account
-
+from . import db
+from .accounts import Account
 from sqlalchemy import func, desc
 from sqlalchemy.orm import column_property
 from sqlalchemy.sql import func, select