Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
118 changes: 118 additions & 0 deletions alembic/versions/6b7c123b3e52_cognition_chat_integration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
"""cognition chat integration

Revision ID: 6b7c123b3e52
Revises: f6bca8990840
Create Date: 2024-01-05 12:29:28.774072

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = "6b7c123b3e52"
down_revision = "f6bca8990840"
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column("user", sa.Column("language_display", sa.String(), nullable=True))
op.add_column(
"conversation",
sa.Column("header", sa.String(), nullable=True),
schema="cognition",
)
op.add_column(
"conversation",
sa.Column("error", sa.String(), nullable=True),
schema="cognition",
)
op.add_column(
"message",
sa.Column("selection_widget", sa.ARRAY(sa.JSON()), nullable=True),
schema="cognition",
)
op.add_column(
"message",
sa.Column("feedback_value", sa.String(), nullable=True),
schema="cognition",
)
op.add_column(
"message",
sa.Column("feedback_category", sa.String(), nullable=True),
schema="cognition",
)
op.drop_column("message", "positive_feedback", schema="cognition")
op.add_column(
"pipeline_logs",
sa.Column("skipped_step", sa.Boolean(), nullable=True),
schema="cognition",
)
op.add_column(
"project",
sa.Column("interface_type", sa.String(), nullable=True),
schema="cognition",
)
op.add_column(
"project",
sa.Column(
"execute_query_enrichment_if_source_code", sa.String(), nullable=True
),
schema="cognition",
)
op.add_column(
"project",
sa.Column("customer_color_primary", sa.String(), nullable=True),
schema="cognition",
)
op.add_column(
"project",
sa.Column("customer_color_primary_only_accent", sa.Boolean(), nullable=True),
schema="cognition",
)
op.add_column(
"project",
sa.Column("customer_color_secondary", sa.String(), nullable=True),
schema="cognition",
)
op.add_column(
"strategy_step",
sa.Column("progress_text", sa.String(), nullable=True),
schema="cognition",
)
op.add_column(
"strategy_step",
sa.Column("execute_if_source_code", sa.String(), nullable=True),
schema="cognition",
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column("strategy_step", "execute_if_source_code", schema="cognition")
op.drop_column("strategy_step", "progress_text", schema="cognition")
op.drop_column("project", "customer_color_secondary", schema="cognition")
op.drop_column("project", "customer_color_primary_only_accent", schema="cognition")
op.drop_column("project", "customer_color_primary", schema="cognition")
op.drop_column(
"project", "execute_query_enrichment_if_source_code", schema="cognition"
)
op.drop_column("project", "interface_type", schema="cognition")
op.drop_column("pipeline_logs", "skipped_step", schema="cognition")
op.add_column(
"message",
sa.Column(
"positive_feedback", sa.BOOLEAN(), autoincrement=False, nullable=True
),
schema="cognition",
)
op.drop_column("message", "feedback_category", schema="cognition")
op.drop_column("message", "feedback_value", schema="cognition")
op.drop_column("message", "selection_widget", schema="cognition")
op.drop_column("conversation", "error", schema="cognition")
op.drop_column("conversation", "header", schema="cognition")
op.drop_column("user", "language_display")
# ### end Alembic commands ###
9 changes: 9 additions & 0 deletions controller/user/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ def update_user_role(user_id: str, role: str) -> User:
return user_item


def update_user_language_display(user_id: str, language_display: str) -> User:
user_item = user.get(user_id)
if not user_item:
raise ValueError("User not found")
user_item.language_display = language_display
general.commit()
return user_item


def remove_organization_from_user(user_mail: str) -> None:
user_id = kratos.get_userid_from_mail(user_mail)
if user_id is None:
Expand Down
18 changes: 16 additions & 2 deletions graphql_api/mutation/organization.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
from typing import Any, Dict
import graphene
from graphql import GraphQLError

from controller.auth import manager as auth
from controller.misc import config_service
from controller.organization import manager as organization_manager
from controller.user import manager as user_manager
from graphql_api.types import Organization
from submodules.model import events
from graphql_api import types
from util import doc_ock


Expand Down Expand Up @@ -48,6 +46,21 @@ def mutate(self, info, user_id: str, role: str):
return ChangeUserRole(ok=True)


class ChangeUserLanguageDisplay(graphene.Mutation):
class Arguments:
user_id = graphene.ID()
language_display = graphene.String()

ok = graphene.Boolean()

def mutate(self, info, user_id: str, language_display: str):
auth.check_demo_access(info)
auth.check_admin_access(info)

user_manager.update_user_language_display(user_id, language_display)
return ChangeUserLanguageDisplay(ok=True)


class RemoveUserFromOrganization(graphene.Mutation):
class Arguments:
user_mail = graphene.String()
Expand Down Expand Up @@ -109,6 +122,7 @@ class OrganizationMutation(graphene.ObjectType):
add_user_to_organization = AddUserToOrganization.Field()
remove_user_from_organization = RemoveUserFromOrganization.Field()
change_user_role = ChangeUserRole.Field()
change_user_language_display = ChangeUserLanguageDisplay.Field()
create_organization = CreateOrganization.Field()
delete_organization = DeleteOrganization.Field()
change_organization = ChangeOrganization.Field()