Merge pull request #50 from LAION-AI/bot_dev

add first bits of jinja template support

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-exclude: "build|stubs"
+exclude: "build|stubs|^bot/templates/"
 
 default_language_version:
   python: python3

backend/alembic/versions/2022_12_22_1835-0daec5f8135f_add_auth_method_to_ix_person_username.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+"""add_auth_method_to_ix_person_username
+
+Revision ID: 0daec5f8135f
+Revises: 6368515778c5
+Create Date: 2022-12-22 18:35:59.609013
+
+"""
+import sqlalchemy as sa  # noqa: F401
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "0daec5f8135f"
+down_revision = "6368515778c5"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index("ix_person_username", table_name="person")
+    op.create_index("ix_person_username", "person", ["api_client_id", "username", "auth_method"], unique=True)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index("ix_person_username", table_name="person")
+    op.create_index("ix_person_username", "person", ["api_client_id", "username"], unique=False)
+    # ### end Alembic commands ###

backend/oasst_backend/api/v1/tasks.py

@@ -169,8 +169,8 @@ def acknowledge_task(
         pr = PromptRepository(db, api_client, user=None)
 
         # here we store the post id in the database for the task
-        pr.bind_frontend_post_id(task_id=task_id, post_id=ack_request.post_id)
         logger.info(f"Frontend acknowledges task {task_id=}, {ack_request=}.")
+        pr.bind_frontend_post_id(task_id=task_id, post_id=ack_request.post_id)
 
     except Exception:
         logger.exception("Failed to acknowledge task.")

backend/oasst_backend/models/person.py

@@ -10,7 +10,7 @@
 
 class Person(SQLModel, table=True):
     __tablename__ = "person"
-    __table_args__ = (Index("ix_person_username", "api_client_id", "username", unique=True),)
+    __table_args__ = (Index("ix_person_username", "api_client_id", "username", "auth_method", unique=True),)
 
     id: Optional[UUID] = Field(
         sa_column=sa.Column(

backend/oasst_backend/prompt_repository.py

@@ -32,7 +32,12 @@ def lookup_person(self, user: protocol_schema.User) -> Person:
         )
         if person is None:
             # user is unknown, create new record
-            person = Person(username=user.id, display_name=user.display_name, api_client_id=self.api_client.id)
+            person = Person(
+                username=user.id,
+                display_name=user.display_name,
+                api_client_id=self.api_client.id,
+                auth_method=user.auth_method,
+            )
             self.db.add(person)
             self.db.commit()
             self.db.refresh(person)

bot/__main__.py

@@ -12,5 +12,7 @@
         backend_url=settings.BACKEND_URL,
         api_key=settings.API_KEY,
         owner_id=settings.OWNER_ID,
+        template_dir=settings.TEMPLATE_DIR,
+        debug=settings.DEBUG,
     )
     bot.run()

bot/api_client.py

@@ -69,6 +69,6 @@ def nack_task(self, task_id: str, reason: str) -> None:
         req = protocol_schema.TaskNAck(reason=reason)
         return self.post(f"/api/v1/tasks/{task_id}/nack", req.dict())
 
-    def post_interaction(self, interaction: protocol_schema.Interaction) -> protocol_schema.TaskDone:
+    def post_interaction(self, interaction: protocol_schema.Interaction) -> protocol_schema.Task:
         data = self.post("/api/v1/tasks/interaction", interaction.dict())
         return self._parse_task(data)