From 2114d5cedf9e24e8aad91f02e419eb9175289126 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 27 Jun 2020 13:48:55 +0200 Subject: update db, add paragraph table --- .../models/__pycache__/paragraph.cpython-37.pyc | Bin 0 -> 1714 bytes .../models/__pycache__/timestamp.cpython-37.pyc | Bin 1852 -> 1925 bytes animism-align/cli/app/sql/models/paragraph.py | 31 +++++++++++++++++++++ animism-align/cli/app/sql/models/timestamp.py | 4 ++- 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 animism-align/cli/app/sql/models/__pycache__/paragraph.cpython-37.pyc create mode 100644 animism-align/cli/app/sql/models/paragraph.py (limited to 'animism-align/cli/app/sql/models') diff --git a/animism-align/cli/app/sql/models/__pycache__/paragraph.cpython-37.pyc b/animism-align/cli/app/sql/models/__pycache__/paragraph.cpython-37.pyc new file mode 100644 index 0000000..f95db72 Binary files /dev/null and b/animism-align/cli/app/sql/models/__pycache__/paragraph.cpython-37.pyc differ diff --git a/animism-align/cli/app/sql/models/__pycache__/timestamp.cpython-37.pyc b/animism-align/cli/app/sql/models/__pycache__/timestamp.cpython-37.pyc index 8337acf..7daec48 100644 Binary files a/animism-align/cli/app/sql/models/__pycache__/timestamp.cpython-37.pyc and b/animism-align/cli/app/sql/models/__pycache__/timestamp.cpython-37.pyc differ diff --git a/animism-align/cli/app/sql/models/paragraph.py b/animism-align/cli/app/sql/models/paragraph.py new file mode 100644 index 0000000..7c7bcd7 --- /dev/null +++ b/animism-align/cli/app/sql/models/paragraph.py @@ -0,0 +1,31 @@ +from sqlalchemy import create_engine, Table, Column, Text, String, Integer, Float, DateTime, JSON, ForeignKey +from sqlalchemy.orm import relationship +import sqlalchemy.sql.functions as func +from sqlalchemy_utc import UtcDateTime, utcnow +from wtforms_alchemy import ModelForm + +from app.sql.common import db, Base, Session +# from app.sql.models.page import Page + +from app.settings import app_cfg + +class Paragraph(Base): + """Table for storing references to graphs""" + __tablename__ = 'paragraph' + id = Column(Integer, primary_key=True) + type = Column(String(16, convert_unicode=True), nullable=False) + settings = Column(JSON, default={}, nullable=True) + + def toJSON(self): + return { + 'id': self.id, + 'type': self.type, + 'settings': self.settings, + } + +class ParagraphForm(ModelForm): + class Meta: + model = Paragraph + exclude = ['settings'] + def get_session(): + return Session() diff --git a/animism-align/cli/app/sql/models/timestamp.py b/animism-align/cli/app/sql/models/timestamp.py index 60e9007..c2bf410 100644 --- a/animism-align/cli/app/sql/models/timestamp.py +++ b/animism-align/cli/app/sql/models/timestamp.py @@ -11,9 +11,10 @@ from app.settings import app_cfg class Timestamp(Base): """Table for storing references to graphs""" - __tablename__ = 'graph' + __tablename__ = 'timestamp' id = Column(Integer, primary_key=True) type = Column(String(16, convert_unicode=True), nullable=False) + paragraph_id = Column(Integer, ForeignKey('paragraph.id'), nullable=True) start_ts = Column(Float, nullable=False) end_ts = Column(Float, nullable=True) sentence = Column(Text(convert_unicode=True), nullable=True) @@ -23,6 +24,7 @@ class Timestamp(Base): return { 'id': self.id, 'type': self.type, + 'paragraph_id': self.paragraph_id, 'start_ts': self.start_ts, 'end_ts': self.end_ts, 'sentence': self.description, -- cgit v1.2.3-70-g09d2