0.2.14

services/db.py

@@ -1,35 +1,41 @@
-from contextlib import contextmanager
-import logging
-from typing import TypeVar, Any, Dict, Generic, Callable
-from sqlalchemy import create_engine, Column, Integer
+# from contextlib import contextmanager
+from typing import Any, Callable, Dict, TypeVar
+
+# from psycopg2.errors import UniqueViolation
+from sqlalchemy import Column, Integer, create_engine
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import Session
 from sqlalchemy.sql.schema import Table
+
 from settings import DB_URL
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
 engine = create_engine(DB_URL, echo=False, pool_size=10, max_overflow=20)
-Session = sessionmaker(bind=engine, expire_on_commit=False)
 
 T = TypeVar("T")
 
 REGISTRY: Dict[str, type] = {}
 
 
-@contextmanager
-def local_session():
-    session = Session()
-    try:
-        yield session
-        session.commit()
-    except Exception as e:
-        print(f"[services.db] Error session: {e}")
-        session.rollback()
-        raise
-    finally:
-        session.close()
+# @contextmanager
+def local_session(src=""):
+    return Session(bind=engine, expire_on_commit=False)
+
+    # try:
+    #     yield session
+    #     session.commit()
+    # except Exception as e:
+    #     if not (src == "create_shout" and isinstance(e, UniqueViolation)):
+    #         import traceback
+
+    #         session.rollback()
+    #         print(f"[services.db] {src}: {e}")
+
+    #         traceback.print_exc()
+
+    #         raise Exception("[services.db] exception")
+
+    # finally:
+    #     session.close()
 
 
 class Base(declarative_base()):
@@ -46,38 +52,17 @@ class Base(declarative_base()):
     def __init_subclass__(cls, **kwargs):
         REGISTRY[cls.__name__] = cls
 
-    @classmethod
-    def create(cls: Generic[T], **kwargs) -> Generic[T]:
-        try:
-            instance = cls(**kwargs)
-            return instance.save()
-        except Exception as e:
-            print(f"[services.db] Error create: {e}")
-            return None
-
-    def save(self) -> Generic[T]:
-        with local_session() as session:
-            try:
-                session.add(self)
-            except Exception as e:
-                print(f"[services.db] Error save: {e}")
-        return self
-
-    def update(self, input):
-        column_names = self.__table__.columns.keys()
-        for name, value in input.items():
-            if name in column_names:
-                setattr(self, name, value)
-        with local_session() as session:
-            try:
-                session.commit()
-            except Exception as e:
-                print(f"[services.db] Error update: {e}")
-
     def dict(self) -> Dict[str, Any]:
         column_names = self.__table__.columns.keys()
+        if "_sa_instance_state" in column_names:
+            column_names.remove("_sa_instance_state")
         try:
             return {c: getattr(self, c) for c in column_names}
         except Exception as e:
             print(f"[services.db] Error dict: {e}")
             return {}
+
+    def update(self, values: Dict[str, Any]) -> None:
+        for key, value in values.items():
+            if hasattr(self, key):
+                setattr(self, key, value)