Sosees04ka/PIbd-42_SSPR
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Заливаем готовую часть #1

Merged
Sosees04ka merged 26 commits from modified_db into main 2024-11-05 21:26:38 +04:00
Conversation 0 Commits 26 Files Changed 57 +30 -31
5 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0059661626 - Show all commits

10
db/models/ch_experimentdb_experiment_data_model.py
View File

@ -1,14 +1,14 @@
from db.models.base import Base, int_pk_incr from sqlalchemy import Identity
from sqlalchemy import Sequence
from sqlalchemy.orm import Mapped, mapped_column from sqlalchemy.orm import Mapped, mapped_column
from db.models.base import Base
class ChExperimentDBExperimentData(Base): class ChExperimentDBExperimentData(Base):
__tablename__ = 'ch_experimentdb_experiment_data' __tablename__ = 'ch_experimentdb_experiment_data'
id: Mapped[int] = mapped_column(primary_key=True, id: Mapped[int] = mapped_column(Identity(start=11, cycle=True),
autoincrement=True, primary_key=True)
server_default=Sequence('ch_experimentdb_experiment_data_id_seq', start=11).next_value())
volume: Mapped[float] volume: Mapped[float]
nitrogen_oxide_emission: Mapped[float] nitrogen_oxide_emission: Mapped[float]
temperature: Mapped[float] temperature: Mapped[float]

13
db/models/experiment_data_model.py
View File

@ -1,17 +1,16 @@
from typing import Optional from typing import Optional
from sqlalchemy import Sequence
from db.models.base import Base, int_pk_incr from sqlalchemy import Identity
from sqlalchemy.orm import Mapped, mapped_column from sqlalchemy.orm import Mapped, mapped_column
id_seq = Sequence('experiment_data_id_seq', start=186581) from db.models.base import Base
class ExperimentData(Base): class ExperimentData(Base):
__tablename__ = 'experiment_data' __tablename__ = 'experiment_data'
id: Mapped[int] = mapped_column(primary_key=True, id: Mapped[int] = mapped_column(Identity(start=21, cycle=True),
autoincrement=True, primary_key=True)
server_default=Sequence('experiment_data_id_seq', start=186581).next_value())
direction: Mapped[float] direction: Mapped[float]
temperature: Mapped[float] temperature: Mapped[float]
nox: Mapped[float] nox: Mapped[float]
@ -20,4 +19,4 @@ class ExperimentData(Base):
file_id: Mapped[Optional[str]] file_id: Mapped[Optional[str]]
def __repr__(self): def __repr__(self):
return f"<ExperimentData>" return f"<ExperimentData>"

14
db/models/experiment_parameters_model.py
View File

@ -1,16 +1,16 @@
from typing import Optional from typing import Optional
from sqlalchemy import Sequence
from sqlalchemy import ForeignKey
from db.models.base import Base, int_pk_incr from sqlalchemy import ForeignKey, Identity
from sqlalchemy.orm import Mapped, mapped_column from sqlalchemy.orm import Mapped, mapped_column
from db.models.base import Base
class ExperimentParameters(Base): class ExperimentParameters(Base):
__tablename__ = 'experiment_parameters' __tablename__ = 'experiment_parameters'
id: Mapped[int] = mapped_column(primary_key=True, id: Mapped[int] = mapped_column(Identity(start=11, cycle=True),
autoincrement=True, primary_key=True)
server_default=Sequence('experiment_parameters_id_seq', start=11).next_value())
outer_blades_count: Mapped[int] outer_blades_count: Mapped[int]
outer_blades_length: Mapped[float] outer_blades_length: Mapped[float]
outer_blades_angle: Mapped[float] outer_blades_angle: Mapped[float]
@ -20,4 +20,4 @@ class ExperimentParameters(Base):
experiment_hash: Mapped[str] experiment_hash: Mapped[str]
def __repr__(self): def __repr__(self):
return f"<ExperimentParameters>" return f"<ExperimentParameters>"

10
db/models/load_parameters_model.py
View File

@ -1,14 +1,14 @@
from db.models.base import Base, int_pk_incr from sqlalchemy import Identity
from sqlalchemy import Sequence
from sqlalchemy.orm import Mapped, mapped_column from sqlalchemy.orm import Mapped, mapped_column
from db.models.base import Base
class LoadParameters(Base): class LoadParameters(Base):
__tablename__ = 'load_parameters' __tablename__ = 'load_parameters'
id: Mapped[int] = mapped_column(primary_key=True, id: Mapped[int] = mapped_column(Identity(start=6, cycle=True),
autoincrement=True, primary_key=True)
server_default=Sequence('load_parameters_id_seq', start=6).next_value())
load: Mapped[int] load: Mapped[int]
primary_air_consumption: Mapped[float] primary_air_consumption: Mapped[float]
secondary_air_consumption: Mapped[float] secondary_air_consumption: Mapped[float]

14
db/models/recycling_parameters_model.py
View File

@ -1,17 +1,17 @@
from typing import Optional from typing import Optional
from sqlalchemy import Sequence
from sqlalchemy import ForeignKey from sqlalchemy import ForeignKey, Identity
from sqlalchemy.orm import Mapped, mapped_column
from db.models.base import Base from db.models.base import Base
from sqlalchemy.orm import Mapped, mapped_column
class RecyclingParameters(Base): class RecyclingParameters(Base):
__tablename__ = 'recycling_parameters' __tablename__ = 'recycling_parameters'
id: Mapped[int] = mapped_column(primary_key=True, id: Mapped[int] = mapped_column(Identity(start=6, cycle=True),
autoincrement=True, primary_key=True)
server_default=Sequence('recycling_parameters_id_seq', start=41).next_value())
load_id: Mapped[Optional[int]] = mapped_column(ForeignKey('load_parameters.id', ondelete='SET NULL')) load_id: Mapped[Optional[int]] = mapped_column(ForeignKey('load_parameters.id', ondelete='SET NULL'))
recycling_level: Mapped[int] recycling_level: Mapped[int]
co2: Mapped[float] co2: Mapped[float]
@ -20,4 +20,4 @@ class RecyclingParameters(Base):
o2: Mapped[float] o2: Mapped[float]
def __repr__(self): def __repr__(self):
return f"<RecyclingParameters>" return f"<RecyclingParameters>"