Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify Table structure #4

Merged
merged 1 commit into from
Sep 6, 2021
Merged

Modify Table structure #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions app/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*-
import datetime
from sqlalchemy import Column, Integer, String, FLOAT, DateTime
from sqlalchemy import Column, Integer, String, FLOAT, DateTime, ForeignKey
from sqlalchemy.sql.functions import now
from sqlalchemy.orm import relationship

from app.database import Base

Expand Down Expand Up @@ -37,12 +38,21 @@ class ClfModel(Base):
class RegModel(Base):
__tablename__ = 'reg_model'

id = Column(Integer, primary_key=True, index=True, autoincrement=True)
model_name = Column(String, primary_key=True)
path = Column(String, nullable=False)

model_metadata = relationship(
"reg_model_metadata", backref="reg_model.model_name")


class RegModelMetadata(Base):
__tablename__ = 'reg_model_metadata'

experiment_name = Column(String, primary_key=True)
reg_model_name = Column(String, ForeignKey(
'reg_model.model_name'), nullable=False)
experimenter = Column(String, nullable=False)
experiment_name = Column(String, nullable=False)
model_name = Column(String, nullable=False)
version = Column(FLOAT, autoincrement=True)
version = Column(FLOAT)
train_mae = Column(FLOAT, nullable=False)
val_mae = Column(FLOAT, nullable=False)
train_mse = Column(FLOAT, nullable=False)
Expand Down
32 changes: 22 additions & 10 deletions module/trial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def main(params, df, engine, experiment_info, connection):
best_model = pd.read_sql(f"""
SELECT *
FROM reg_model
WHERE experiment_name = {experiment_name}
WHERE model_name = {model_name}
""", engine)

if len(best_model) == 0:
Expand All @@ -118,20 +118,27 @@ def main(params, df, engine, experiment_info, connection):
pickle.dump(model, f)
connection.execute(f"""
INSERT INTO reg_model (
path,
experimenter,
experiment_name,
model_name,
path
) VALUES(
{model_name},
{path}
)
""")
connection.execute(f"""
INSERT INTO reg_model_metadata (
experiment_name,
reg_model_name,
experimenter,
version,
train_mae,
val_mae,
train_mse,
val_mse
) VALUES (
{path},
{experimenter},
{experiment_name},
{model_name},
{experimenter},
{version},
{tr_mae_mean},
{tr_mse_mean},
Expand All @@ -140,12 +147,17 @@ def main(params, df, engine, experiment_info, connection):
)
""")
else:
with open(f"{os.path.join(path, model_name)}.pkl".replace("'", ""), "wb") as f:
pickle.dump(model, f)
saved_score = best_model['val_mae'].values[0]
best_model_metadata = pd.read_sql(f"""
SELECT val_mae
FROM reg_model_metadata
WHERE reg_model_name = {model_name}
""", engine)
saved_score = best_model_metadata.values[0]
if saved_score > valid_mae:
with open(f"{os.path.join(path, model_name)}.pkl".replace("'", ""), "wb") as f:
pickle.dump(model, f)
connection.execute(f"""
UPDATE reg_model
UPDATE reg_model_metadata
SET
train_mae = {tr_mae_mean},
val_mae = {cv_mae_mean},
Expand Down