- check if observation already exits in Db, then insert

gschliefgraben_glasfaser/models.py

@@ -10,25 +10,19 @@ from datetime import datetime
 
 import os
 from sqlalchemy import (Column, Integer,
-                        String, DateTime, ForeignKey, Numeric, SmallInteger, create_engine)
+                        String, DateTime, ForeignKey, Numeric, SmallInteger, create_engine, func)
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import session, relationship
+from sqlalchemy.orm import session, relationship, sessionmaker
 #from marshmallow import Schema
 from marshmallow_sqlalchemy import SQLAlchemySchema, SQLAlchemyAutoSchema
 from marshmallow import fields
 # from db.pg_models import create_pg_session
-from sqlalchemy import func, desc, asc
-import sqlalchemy.orm.session
-from sqlalchemy.orm import sessionmaker, relationship
+# import sqlalchemy.orm.session
 
 Base = declarative_base()
-def new_id_factory():
-    pg_session = create_pg_session()
-    _MYTABLE_ID_ = pg_session.query(func.max(Observation.id)).scalar()
-    _MYTABLE_ID_ += 1
-    return _MYTABLE_ID_
 
-def create_pg_session() -> sqlalchemy.orm.sessionmaker:
+
+def create_pg_session() -> sessionmaker:
     """ create postgres db session """
     dbschema = ''
     db_user = os.environ.get("POSTGIS_DBUSER")
@@ -39,10 +33,11 @@ def create_pg_session() -> sqlalchemy.orm.sessionmaker:
         connect_args={'options': '-csearch_path={}'.format(dbschema)},
         isolation_level="READ UNCOMMITTED")
     session_maker = sessionmaker(bind=engine)
-    session = session_maker()
+    _session = session_maker()
 
     # Base.metadata.create_all(engine)
-    return session
+    return _session
+
 
 class Dataset(Base):
     """ dataset class """
@@ -75,29 +70,47 @@ class Dataset(Base):
     # first_observation = relationship("Observation", foreign_keys=[
     #                                  fk_first_observation_id])
 
-    observations = relationship(
-        'Observation', back_populates='dataset', lazy=True)
-    
+    # observations = relationship(
+    #     'Observation', back_populates='dataset', lazy=True)
+
+def new_id_factory():
+    ''' test '''
+    dbschema = ''
+    db_user = os.environ.get("POSTGIS_DBUSER")
+    db_password = os.environ.get("POSTGIS_DBPASSWORD")
+    db_url = os.environ.get("POSTGIS_DBURL")
+    engine = create_engine(
+        "postgresql+psycopg2://" + db_user + ":" + db_password + "@" + db_url,
+        connect_args={'options': '-csearch_path={}'.format(dbschema)},
+        isolation_level="READ UNCOMMITTED")
+    result = engine.execute('SELECT MAX(observation_id) FROM gba.observation')
+    mytable_max_id = result.first().max
+    if mytable_max_id is None:
+        mytable_max_id = 0
+    mytable_max_id += 1
+    return mytable_max_id
+
+
 class Observation(Base):
     """ observation class """
     __tablename__ = 'observation'
     __table_args__ = {"schema": "gba"}
 
-    id = Column('observation_id', Integer,
-                primary_key=True)
+    id = Column('observation_id', Integer, primary_key=True)
     name = Column('name', String)
-    value_type = Column('value_type', String)
+    value_type = Column('value_type', String, default="quantity")
     # pitch = Column('PITCH', String)
     # roll = Column('ROLL', String)
     sampling_time_start = Column('sampling_time_start', DateTime)
     sampling_time_end = Column('sampling_time_end', DateTime)
     result_time = Column('result_time', DateTime)
     sta_identifier = Column('sta_identifier', String)
+    value_identifier = Column('value_identifier', String)
     value_quantity = Column('value_quantity', Numeric(20, 10), nullable=False)
 
-    fk_dataset_id = Column(Integer, ForeignKey(
-        'gba.dataset.dataset_id'), nullable=False)
-    dataset = relationship("Dataset", back_populates="observations")
+    # fk_dataset_id = Column(Integer, ForeignKey(
+    #     'gba.dataset.dataset_id'), nullable=False)
+    # dataset = relationship("Dataset", back_populates="observations")
 
 
 class ObservationSchema(SQLAlchemySchema):
@@ -106,7 +119,7 @@ class ObservationSchema(SQLAlchemySchema):
     # value_quantity = fields.Integer(attribute='Value')
     # id = fields.Integer(attribute='id')
     Value = fields.Integer(attribute='value_quantity')
-    id = fields.Integer(attribute='sta_identifier')
+    id = fields.Integer(attribute='value_identifier')
     # sta_identifier= fields.String(default=uuid.uuid4()),
 
     class Meta:
@@ -134,7 +147,7 @@ class Person(Base):
             self.login, self.lname)
 
 
-class PersonSchema(SQLAlchemyAutoSchema):    
+class PersonSchema(SQLAlchemyAutoSchema):
     """ Platform class """
     class Meta:
         """ Platform class """
@@ -144,12 +157,12 @@ class PersonSchema(SQLAlchemyAutoSchema):
         #pg_session: session = create_pg_session()
         sqla_session: session = create_pg_session()
 
+
 def create_db():
-    # db_url  = 'sqlite:///db.sqlite'    
-    # engine = create_engine(db_url, echo = True )  
+    # db_url  = 'sqlite:///db.sqlite'
+    # engine = create_engine(db_url, echo = True )
     # Base.metadata.drop_all(bind=engine)
     # Base.metadata.create_all(engine)
-    
     """ create postgres db session """
     dbschema = ''
     db_user = os.environ.get("POSTGIS_DBUSER")
@@ -158,11 +171,12 @@ def create_db():
     engine = create_engine(
         "postgresql+psycopg2://" + db_user + ":" + db_password + "@" + db_url,
         connect_args={'options': '-csearch_path={}'.format(dbschema)},
-        isolation_level="READ UNCOMMITTED", echo = True)
+        isolation_level="READ UNCOMMITTED", echo=True)
     # session_maker = sessionmaker(bind=engine)
     # session = session_maker()
     Base.metadata.drop_all(bind=engine)
     Base.metadata.create_all(engine)
-        
+
+
 if __name__ == "__main__":
-    create_db()
+    create_db()