Skip to content

Commit

Permalink
delete input prompts (#3380)
Browse files Browse the repository at this point in the history
* delete input prompts

* nit

* remove vestigial test

* nit
  • Loading branch information
pablonyx authored Dec 10, 2024
1 parent 48c1027 commit 878a189
Show file tree
Hide file tree
Showing 29 changed files with 69 additions and 1,450 deletions.
57 changes: 57 additions & 0 deletions backend/alembic/versions/bf7a81109301_delete_input_prompts.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
"""delete_input_prompts
Revision ID: bf7a81109301
Revises: f7a894b06d02
Create Date: 2024-12-09 12:00:49.884228
"""
from alembic import op
import sqlalchemy as sa
import fastapi_users_db_sqlalchemy


# revision identifiers, used by Alembic.
revision = "bf7a81109301"
down_revision = "f7a894b06d02"
branch_labels = None
depends_on = None


def upgrade() -> None:
op.drop_table("inputprompt__user")
op.drop_table("inputprompt")


def downgrade() -> None:
op.create_table(
"inputprompt",
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("prompt", sa.String(), nullable=False),
sa.Column("content", sa.String(), nullable=False),
sa.Column("active", sa.Boolean(), nullable=False),
sa.Column("is_public", sa.Boolean(), nullable=False),
sa.Column(
"user_id",
fastapi_users_db_sqlalchemy.generics.GUID(),
nullable=True,
),
sa.ForeignKeyConstraint(
["user_id"],
["user.id"],
),
sa.PrimaryKeyConstraint("id"),
)
op.create_table(
"inputprompt__user",
sa.Column("input_prompt_id", sa.Integer(), nullable=False),
sa.Column("user_id", sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(
["input_prompt_id"],
["inputprompt.id"],
),
sa.ForeignKeyConstraint(
["user_id"],
["inputprompt.id"],
),
sa.PrimaryKeyConstraint("input_prompt_id", "user_id"),
)
1 change: 0 additions & 1 deletion backend/danswer/configs/chat_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

PROMPTS_YAML = "./danswer/seeding/prompts.yaml"
PERSONAS_YAML = "./danswer/seeding/personas.yaml"
INPUT_PROMPT_YAML = "./danswer/seeding/input_prompts.yaml"

NUM_RETURNED_HITS = 50
# Used for LLM filtering and reranking
Expand Down
202 changes: 0 additions & 202 deletions backend/danswer/db/input_prompt.py

This file was deleted.

28 changes: 0 additions & 28 deletions backend/danswer/db/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,6 @@ class User(SQLAlchemyBaseUserTableUUID, Base):
)

prompts: Mapped[list["Prompt"]] = relationship("Prompt", back_populates="user")
input_prompts: Mapped[list["InputPrompt"]] = relationship(
"InputPrompt", back_populates="user"
)

# Personas owned by this user
personas: Mapped[list["Persona"]] = relationship("Persona", back_populates="user")
Expand All @@ -178,31 +175,6 @@ class User(SQLAlchemyBaseUserTableUUID, Base):
)


class InputPrompt(Base):
__tablename__ = "inputprompt"

id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
prompt: Mapped[str] = mapped_column(String)
content: Mapped[str] = mapped_column(String)
active: Mapped[bool] = mapped_column(Boolean)
user: Mapped[User | None] = relationship("User", back_populates="input_prompts")
is_public: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
user_id: Mapped[UUID | None] = mapped_column(
ForeignKey("user.id", ondelete="CASCADE"), nullable=True
)


class InputPrompt__User(Base):
__tablename__ = "inputprompt__user"

input_prompt_id: Mapped[int] = mapped_column(
ForeignKey("inputprompt.id"), primary_key=True
)
user_id: Mapped[UUID | None] = mapped_column(
ForeignKey("inputprompt.id"), primary_key=True
)


class AccessToken(SQLAlchemyBaseAccessTokenTableUUID, Base):
pass

Expand Down
6 changes: 0 additions & 6 deletions backend/danswer/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@
from danswer.server.documents.indexing import router as indexing_router
from danswer.server.features.document_set.api import router as document_set_router
from danswer.server.features.folder.api import router as folder_router
from danswer.server.features.input_prompt.api import (
admin_router as admin_input_prompt_router,
)
from danswer.server.features.input_prompt.api import basic_router as input_prompt_router
from danswer.server.features.notifications.api import router as notification_router
from danswer.server.features.persona.api import admin_router as admin_persona_router
from danswer.server.features.persona.api import basic_router as persona_router
Expand Down Expand Up @@ -258,8 +254,6 @@ def get_application() -> FastAPI:
)
include_router_with_global_prefix_prepended(application, persona_router)
include_router_with_global_prefix_prepended(application, admin_persona_router)
include_router_with_global_prefix_prepended(application, input_prompt_router)
include_router_with_global_prefix_prepended(application, admin_input_prompt_router)
include_router_with_global_prefix_prepended(application, notification_router)
include_router_with_global_prefix_prepended(application, prompt_router)
include_router_with_global_prefix_prepended(application, tool_router)
Expand Down
24 changes: 0 additions & 24 deletions backend/danswer/seeding/input_prompts.yaml

This file was deleted.

Loading

0 comments on commit 878a189

Please sign in to comment.