- now adding observations to dataset
- addiotonal notes for pip in notes.txt - pip requirements.txt
This commit is contained in:
parent
e2ceb107c9
commit
f104e9e74b
4 changed files with 117 additions and 37 deletions
|
|
@ -38,6 +38,51 @@ def create_pg_session() -> sessionmaker:
|
|||
# Base.metadata.create_all(engine)
|
||||
return _session
|
||||
|
||||
class Platform(Base):
|
||||
""" Platform class """
|
||||
__tablename__ = 'platform'
|
||||
__table_args__ = {"schema": "gba"}
|
||||
|
||||
id = Column('platform_id', Integer, primary_key=True)
|
||||
identifier = Column('identifier', String)
|
||||
sta_identifier = Column('sta_identifier', String)
|
||||
name = Column('name', String)
|
||||
# datasets = relationship('Dataset')
|
||||
datasets = relationship('Dataset', back_populates="platform", lazy=True)
|
||||
|
||||
def __repr__(self):
|
||||
return f'Platform {self.name}'
|
||||
|
||||
|
||||
class Phenomenon(Base):
|
||||
""" phenomenon class """
|
||||
__tablename__ = 'phenomenon'
|
||||
__table_args__ = {"schema": "gba"}
|
||||
|
||||
id = Column('phenomenon_id', Integer, primary_key=True)
|
||||
name = Column('name', String)
|
||||
sta_identifier = Column('sta_identifier', String)
|
||||
# datasets = relationship('Dataset')
|
||||
datasets = relationship('Dataset', back_populates="phenomenon", lazy=True)
|
||||
|
||||
def __repr__(self):
|
||||
return f'Phenomenon {self.name}'
|
||||
|
||||
|
||||
class Procedure(Base):
|
||||
""" procedure class """
|
||||
__tablename__ = 'procedure'
|
||||
__table_args__ = {"schema": "gba"}
|
||||
|
||||
id = Column('procedure_id', Integer, primary_key=True)
|
||||
name = Column('name', String)
|
||||
sta_identifier = Column('sta_identifier', String)
|
||||
# datasets = relationship('Dataset')
|
||||
datasets = relationship('Dataset', back_populates="procedure", lazy=True)
|
||||
|
||||
def __repr__(self):
|
||||
return f'Procedure {self.name}'
|
||||
|
||||
|
||||
class Dataset(Base):
|
||||
""" dataset class """
|
||||
|
|
@ -70,8 +115,25 @@ 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)
|
||||
|
||||
fk_phenomenon_id = Column(
|
||||
'fk_phenomenon_id', Integer, ForeignKey('gba.phenomenon.phenomenon_id'), nullable=False)
|
||||
# phenomenon = relationship("Phenomenon", lazy="joined", foreign_keys=[fk_phenomenon_id])
|
||||
phenomenon = relationship(
|
||||
"Phenomenon", back_populates="datasets", lazy="joined")
|
||||
|
||||
fk_platform_id = Column('fk_platform_id', Integer, ForeignKey(
|
||||
'gba.platform.platform_id'), nullable=True)
|
||||
platform = relationship(
|
||||
"Platform", back_populates="datasets", lazy="joined")
|
||||
|
||||
fk_procedure_id = Column('fk_procedure_id', Integer, ForeignKey(
|
||||
'gba.procedure.procedure_id'), nullable=False)
|
||||
# procedure = relationship("Procedure", lazy="joined")
|
||||
procedure = relationship(
|
||||
"Procedure", back_populates="datasets", lazy="joined")
|
||||
|
||||
def new_id_factory():
|
||||
''' test '''
|
||||
|
|
@ -108,9 +170,9 @@ class Observation(Base):
|
|||
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):
|
||||
|
|
@ -175,7 +237,7 @@ def create_db():
|
|||
# session_maker = sessionmaker(bind=engine)
|
||||
# session = session_maker()
|
||||
Base.metadata.drop_all(bind=engine)
|
||||
Base.metadata.create_all(engine)
|
||||
# Base.metadata.create_all(engine)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue