From 82c2ac11f4ef2112a0332f2f9c7cdd52444f0d2a Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 4 Jul 2020 17:24:21 +0200 Subject: displaying annotation list, click to select, doubleclick to show form, updating annotations --- animism-align/cli/app/sql/models/annotation.py | 2 +- animism-align/cli/app/sql/models/paragraph.py | 4 ++ .../sql/versions/202007041633_create_database.py | 56 --------------------- .../sql/versions/202007041642_create_database.py | 58 ++++++++++++++++++++++ 4 files changed, 63 insertions(+), 57 deletions(-) delete mode 100644 animism-align/cli/app/sql/versions/202007041633_create_database.py create mode 100644 animism-align/cli/app/sql/versions/202007041642_create_database.py (limited to 'animism-align/cli') diff --git a/animism-align/cli/app/sql/models/annotation.py b/animism-align/cli/app/sql/models/annotation.py index 6cc476c..cc53bd6 100644 --- a/animism-align/cli/app/sql/models/annotation.py +++ b/animism-align/cli/app/sql/models/annotation.py @@ -27,7 +27,7 @@ class Annotation(Base): 'paragraph_id': self.paragraph_id, 'start_ts': self.start_ts, 'end_ts': self.end_ts, - 'sentence': self.description, + 'text': self.text, 'settings': self.settings, } diff --git a/animism-align/cli/app/sql/models/paragraph.py b/animism-align/cli/app/sql/models/paragraph.py index 7c7bcd7..790c9f0 100644 --- a/animism-align/cli/app/sql/models/paragraph.py +++ b/animism-align/cli/app/sql/models/paragraph.py @@ -14,12 +14,16 @@ class Paragraph(Base): __tablename__ = 'paragraph' id = Column(Integer, primary_key=True) type = Column(String(16, convert_unicode=True), nullable=False) + start_ts = Column(Float, nullable=False) + end_ts = Column(Float, nullable=True) settings = Column(JSON, default={}, nullable=True) def toJSON(self): return { 'id': self.id, 'type': self.type, + 'start_ts': self.start_ts, + 'end_ts': self.end_ts, 'settings': self.settings, } diff --git a/animism-align/cli/app/sql/versions/202007041633_create_database.py b/animism-align/cli/app/sql/versions/202007041633_create_database.py deleted file mode 100644 index f8336e5..0000000 --- a/animism-align/cli/app/sql/versions/202007041633_create_database.py +++ /dev/null @@ -1,56 +0,0 @@ -"""create database - -Revision ID: f8936a84e584 -Revises: -Create Date: 2020-07-04 16:33:01.643193 - -""" -from alembic import op -import sqlalchemy as sa -import sqlalchemy_utc - - -# revision identifiers, used by Alembic. -revision = 'f8936a84e584' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - 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('settings', sa.JSON(), nullable=True), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('upload', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('sha256', sa.String(length=256), nullable=False), - sa.Column('fn', sa.String(length=256), nullable=False), - sa.Column('ext', sa.String(length=4, _expect_unicode=True), nullable=False), - sa.Column('username', sa.String(length=16, _expect_unicode=True), nullable=False), - sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('annotation', - 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('text', 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('annotation') - op.drop_table('upload') - op.drop_table('paragraph') - # ### end Alembic commands ### diff --git a/animism-align/cli/app/sql/versions/202007041642_create_database.py b/animism-align/cli/app/sql/versions/202007041642_create_database.py new file mode 100644 index 0000000..bec0cc3 --- /dev/null +++ b/animism-align/cli/app/sql/versions/202007041642_create_database.py @@ -0,0 +1,58 @@ +"""create database + +Revision ID: 4ede1524f909 +Revises: +Create Date: 2020-07-04 16:42:00.443043 + +""" +from alembic import op +import sqlalchemy as sa +import sqlalchemy_utc + + +# revision identifiers, used by Alembic. +revision = '4ede1524f909' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + 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('settings', sa.JSON(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('upload', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('sha256', sa.String(length=256), nullable=False), + sa.Column('fn', sa.String(length=256), nullable=False), + sa.Column('ext', sa.String(length=4, _expect_unicode=True), nullable=False), + sa.Column('username', sa.String(length=16, _expect_unicode=True), nullable=False), + sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('annotation', + 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('text', 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('annotation') + op.drop_table('upload') + op.drop_table('paragraph') + # ### end Alembic commands ### -- cgit v1.2.3-70-g09d2