From 78674667008b2e201bb68e64a6d31e8ab2e38851 Mon Sep 17 00:00:00 2001 From: Igor Miagkov Date: Fri, 30 Dec 2022 01:14:31 +0400 Subject: [PATCH] added trusted api client flag --- ...0_added_lang_column_for_iso_639_1_codes.py | 4 +-- ...64ec4667aae_add_collective_flag_to_task.py | 4 +-- ...ce3675c1f5_add_field_trusted_api_client.py | 28 +++++++++++++++++++ backend/oasst_backend/api/deps.py | 2 +- backend/oasst_backend/models/api_client.py | 2 ++ 5 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 backend/alembic/versions/2022_12_30_0109-73ce3675c1f5_add_field_trusted_api_client.py diff --git a/backend/alembic/versions/2022_12_28_1824-ef0b52902560_added_lang_column_for_iso_639_1_codes.py b/backend/alembic/versions/2022_12_28_1824-ef0b52902560_added_lang_column_for_iso_639_1_codes.py index cb6ae5da..66ff2692 100644 --- a/backend/alembic/versions/2022_12_28_1824-ef0b52902560_added_lang_column_for_iso_639_1_codes.py +++ b/backend/alembic/versions/2022_12_28_1824-ef0b52902560_added_lang_column_for_iso_639_1_codes.py @@ -2,7 +2,7 @@ """Added lang column for ISO-639-1 codes Revision ID: ef0b52902560 -Revises: 3358eb6834e6 +Revises: d24b37426857 Create Date: 2022-12-28 18:24:21.393973 """ @@ -12,7 +12,7 @@ from alembic import op # revision identifiers, used by Alembic. revision = "ef0b52902560" -down_revision = "3358eb6834e6" +down_revision = "d24b37426857" branch_labels = None depends_on = None diff --git a/backend/alembic/versions/2022_12_29_2103-464ec4667aae_add_collective_flag_to_task.py b/backend/alembic/versions/2022_12_29_2103-464ec4667aae_add_collective_flag_to_task.py index cbed707c..42b8ccf8 100644 --- a/backend/alembic/versions/2022_12_29_2103-464ec4667aae_add_collective_flag_to_task.py +++ b/backend/alembic/versions/2022_12_29_2103-464ec4667aae_add_collective_flag_to_task.py @@ -2,7 +2,7 @@ """add collective flag to task Revision ID: 464ec4667aae -Revises: d24b37426857 +Revises: ef0b52902560 Create Date: 2022-12-29 21:03:06.841962 """ @@ -11,7 +11,7 @@ from alembic import op # revision identifiers, used by Alembic. revision = "464ec4667aae" -down_revision = "d24b37426857" +down_revision = "ef0b52902560" branch_labels = None depends_on = None diff --git a/backend/alembic/versions/2022_12_30_0109-73ce3675c1f5_add_field_trusted_api_client.py b/backend/alembic/versions/2022_12_30_0109-73ce3675c1f5_add_field_trusted_api_client.py new file mode 100644 index 00000000..303ca3fc --- /dev/null +++ b/backend/alembic/versions/2022_12_30_0109-73ce3675c1f5_add_field_trusted_api_client.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +"""add field trusted api client + +Revision ID: 73ce3675c1f5 +Revises: 464ec4667aae +Create Date: 2022-12-30 01:09:06.446020 + +""" +import sqlalchemy as sa +from alembic import op + +# revision identifiers, used by Alembic. +revision = "73ce3675c1f5" +down_revision = "464ec4667aae" +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.add_column("api_client", sa.Column("trusted", sa.Boolean(), server_default=sa.text("false"), nullable=False)) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column("api_client", "trusted") + # ### end Alembic commands ### diff --git a/backend/oasst_backend/api/deps.py b/backend/oasst_backend/api/deps.py index d4a7ef50..9c4feee2 100644 --- a/backend/oasst_backend/api/deps.py +++ b/backend/oasst_backend/api/deps.py @@ -40,7 +40,7 @@ def get_dummy_api_client(db: Session) -> ApiClient: if api_client is None: token = token_hex(32) logger.info(f"ANY_API_KEY missing, inserting api_key: {token}") - api_client = ApiClient(id=ANY_API_KEY_ID, api_key=token, description="ANY_API_KEY, random token") + api_client = ApiClient(id=ANY_API_KEY_ID, api_key=token, description="ANY_API_KEY, random token", trusted=True) db.add(api_client) db.commit() return api_client diff --git a/backend/oasst_backend/models/api_client.py b/backend/oasst_backend/models/api_client.py index f0050a90..e8d722d5 100644 --- a/backend/oasst_backend/models/api_client.py +++ b/backend/oasst_backend/models/api_client.py @@ -4,6 +4,7 @@ from uuid import UUID, uuid4 import sqlalchemy as sa import sqlalchemy.dialects.postgresql as pg +from sqlalchemy import false from sqlmodel import Field, SQLModel @@ -19,3 +20,4 @@ class ApiClient(SQLModel, table=True): description: str = Field(max_length=256) admin_email: Optional[str] = Field(max_length=256, nullable=True) enabled: bool = Field(default=True) + trusted: bool = Field(sa_column=sa.Column(sa.Boolean, nullable=False, server_default=false()))