diff options
Diffstat (limited to 'animism-align/cli/app')
19 files changed, 54 insertions, 10 deletions
diff --git a/animism-align/cli/app/sql/__pycache__/common.cpython-37.pyc b/animism-align/cli/app/sql/__pycache__/common.cpython-37.pyc Binary files differindex fe626e5..f995f96 100644 --- a/animism-align/cli/app/sql/__pycache__/common.cpython-37.pyc +++ b/animism-align/cli/app/sql/__pycache__/common.cpython-37.pyc diff --git a/animism-align/cli/app/sql/__pycache__/env.cpython-37.pyc b/animism-align/cli/app/sql/__pycache__/env.cpython-37.pyc Binary files differindex b8ea29b..96f3d85 100644 --- a/animism-align/cli/app/sql/__pycache__/env.cpython-37.pyc +++ b/animism-align/cli/app/sql/__pycache__/env.cpython-37.pyc diff --git a/animism-align/cli/app/sql/common.py b/animism-align/cli/app/sql/common.py index 6f3586b..d79bc06 100644 --- a/animism-align/cli/app/sql/common.py +++ b/animism-align/cli/app/sql/common.py @@ -32,4 +32,5 @@ db = SQLAlchemy() # include the models in reverse dependency order, so relationships work from app.sql.models.timestamp import Timestamp +from app.sql.models.paragraph import Paragraph from app.sql.models.upload import Upload diff --git a/animism-align/cli/app/sql/env.py b/animism-align/cli/app/sql/env.py index 839a30b..af21e0e 100644 --- a/animism-align/cli/app/sql/env.py +++ b/animism-align/cli/app/sql/env.py @@ -15,6 +15,7 @@ target_metadata = Base.metadata # include the models in reverse dependency order, so relationships work from app.sql.models.timestamp import Timestamp +from app.sql.models.paragraph import Paragraph from app.sql.models.upload import Upload def run_migrations_offline(): 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 Binary files differnew file mode 100644 index 0000000..f95db72 --- /dev/null +++ b/animism-align/cli/app/sql/models/__pycache__/paragraph.cpython-37.pyc 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 Binary files differindex 8337acf..7daec48 100644 --- a/animism-align/cli/app/sql/models/__pycache__/timestamp.cpython-37.pyc +++ b/animism-align/cli/app/sql/models/__pycache__/timestamp.cpython-37.pyc 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, diff --git a/animism-align/cli/app/sql/versions/202006231946_create_database.py b/animism-align/cli/app/sql/versions/202006271347_add_paragraphs.py index b74f9b3..cc134b5 100644 --- a/animism-align/cli/app/sql/versions/202006231946_create_database.py +++ b/animism-align/cli/app/sql/versions/202006271347_add_paragraphs.py @@ -1,8 +1,8 @@ -"""create database +"""add paragraphs -Revision ID: e45386a1498b +Revision ID: 650f7cdb3174 Revises: -Create Date: 2020-06-23 19:46:05.161996 +Create Date: 2020-06-27 13:47:33.766574 """ from alembic import op @@ -11,7 +11,7 @@ import sqlalchemy_utc # revision identifiers, used by Alembic. -revision = 'e45386a1498b' +revision = '650f7cdb3174' down_revision = None branch_labels = None depends_on = None @@ -19,12 +19,9 @@ depends_on = None def upgrade(): # ### commands auto generated by Alembic - please adjust! ### - op.create_table('graph', + op.create_table('paragraph', sa.Column('id', sa.Integer(), nullable=False), sa.Column('type', sa.String(length=16, _expect_unicode=True), nullable=False), - sa.Column('start_ts', sa.Float(), nullable=False), - sa.Column('end_ts', sa.Float(), nullable=True), - sa.Column('sentence', sa.Text(_expect_unicode=True), nullable=True), sa.Column('settings', sa.JSON(), nullable=True), sa.PrimaryKeyConstraint('id') ) @@ -37,11 +34,23 @@ def upgrade(): sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), sa.PrimaryKeyConstraint('id') ) + op.create_table('timestamp', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('type', sa.String(length=16, _expect_unicode=True), nullable=False), + sa.Column('paragraph_id', sa.Integer(), nullable=True), + sa.Column('start_ts', sa.Float(), nullable=False), + sa.Column('end_ts', sa.Float(), nullable=True), + sa.Column('sentence', sa.Text(_expect_unicode=True), nullable=True), + sa.Column('settings', sa.JSON(), nullable=True), + sa.ForeignKeyConstraint(['paragraph_id'], ['paragraph.id'], ), + sa.PrimaryKeyConstraint('id') + ) # ### end Alembic commands ### def downgrade(): # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('timestamp') op.drop_table('upload') - op.drop_table('graph') + op.drop_table('paragraph') # ### end Alembic commands ### diff --git a/animism-align/cli/app/sql/versions/__pycache__/202006011922_creating_database.cpython-37.pyc b/animism-align/cli/app/sql/versions/__pycache__/202006011922_creating_database.cpython-37.pyc Binary files differdeleted file mode 100644 index a1adb31..0000000 --- a/animism-align/cli/app/sql/versions/__pycache__/202006011922_creating_database.cpython-37.pyc +++ /dev/null diff --git a/animism-align/cli/app/sql/versions/__pycache__/202006011923_adding_pages_table.cpython-37.pyc b/animism-align/cli/app/sql/versions/__pycache__/202006011923_adding_pages_table.cpython-37.pyc Binary files differdeleted file mode 100644 index beeeb71..0000000 --- a/animism-align/cli/app/sql/versions/__pycache__/202006011923_adding_pages_table.cpython-37.pyc +++ /dev/null diff --git a/animism-align/cli/app/sql/versions/__pycache__/202006011925_adding_tiles_table.cpython-37.pyc b/animism-align/cli/app/sql/versions/__pycache__/202006011925_adding_tiles_table.cpython-37.pyc Binary files differdeleted file mode 100644 index 8d16725..0000000 --- a/animism-align/cli/app/sql/versions/__pycache__/202006011925_adding_tiles_table.cpython-37.pyc +++ /dev/null diff --git a/animism-align/cli/app/sql/versions/__pycache__/202006011937_adding_pages.cpython-37.pyc b/animism-align/cli/app/sql/versions/__pycache__/202006011937_adding_pages.cpython-37.pyc Binary files differdeleted file mode 100644 index 35b459c..0000000 --- a/animism-align/cli/app/sql/versions/__pycache__/202006011937_adding_pages.cpython-37.pyc +++ /dev/null diff --git a/animism-align/cli/app/sql/versions/__pycache__/202006011943_adding_database.cpython-37.pyc b/animism-align/cli/app/sql/versions/__pycache__/202006011943_adding_database.cpython-37.pyc Binary files differdeleted file mode 100644 index adf3587..0000000 --- a/animism-align/cli/app/sql/versions/__pycache__/202006011943_adding_database.cpython-37.pyc +++ /dev/null diff --git a/animism-align/cli/app/sql/versions/__pycache__/202006011944_adding_uploads.cpython-37.pyc b/animism-align/cli/app/sql/versions/__pycache__/202006011944_adding_uploads.cpython-37.pyc Binary files differdeleted file mode 100644 index 159dc66..0000000 --- a/animism-align/cli/app/sql/versions/__pycache__/202006011944_adding_uploads.cpython-37.pyc +++ /dev/null diff --git a/animism-align/cli/app/sql/versions/__pycache__/202006021608_creating_database.cpython-37.pyc b/animism-align/cli/app/sql/versions/__pycache__/202006021608_creating_database.cpython-37.pyc Binary files differdeleted file mode 100644 index c5df7ca..0000000 --- a/animism-align/cli/app/sql/versions/__pycache__/202006021608_creating_database.cpython-37.pyc +++ /dev/null diff --git a/animism-align/cli/app/sql/versions/__pycache__/202006041801_add_sort_order_to_tiles.cpython-37.pyc b/animism-align/cli/app/sql/versions/__pycache__/202006041801_add_sort_order_to_tiles.cpython-37.pyc Binary files differdeleted file mode 100644 index 67e35cf..0000000 --- a/animism-align/cli/app/sql/versions/__pycache__/202006041801_add_sort_order_to_tiles.cpython-37.pyc +++ /dev/null diff --git a/animism-align/cli/app/sql/versions/__pycache__/202006231946_create_database.cpython-37.pyc b/animism-align/cli/app/sql/versions/__pycache__/202006231946_create_database.cpython-37.pyc Binary files differdeleted file mode 100644 index dd49abc..0000000 --- a/animism-align/cli/app/sql/versions/__pycache__/202006231946_create_database.cpython-37.pyc +++ /dev/null diff --git a/animism-align/cli/app/sql/versions/__pycache__/202006271347_add_paragraphs.cpython-37.pyc b/animism-align/cli/app/sql/versions/__pycache__/202006271347_add_paragraphs.cpython-37.pyc Binary files differnew file mode 100644 index 0000000..79fc207 --- /dev/null +++ b/animism-align/cli/app/sql/versions/__pycache__/202006271347_add_paragraphs.cpython-37.pyc |