糸ç細部

config.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import os
 from typing import TypedDict
 
-from eloquent import DatabaseManager, Model
+from eloquent import DatabaseManager, Model  # type: ignore
 
 CONFIG: dict[str, DbConfig] = { 'mysql': { 'driver':    'mysql',
                                            'host':      'localhost',

connection.sample.py

@@ -5,4 +5,3 @@ OPENAI_ORGANISATION: str = 'org-XXXXXXXXXXXXXXXXXXXXXXXX'
 
 # API Key
 OPENAI_API_KEY: str = 'sk-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
-

consts.py

@@ -1,13 +1,6 @@
 from enum import Enum
 
 
-class AnswerType (Enum):
-    YOUTUBE_REPLY   = 1
-    BLUESKY_REPLY   = 2
-    YOUTUBE_SYSTEM  = 3
-    BLUESKY_SYSTEM  = 4
-
-
 class Character (Enum):
     DEERJIKA    = 1
     GOATOH      = 2
@@ -27,4 +20,8 @@ class QueryType (Enum):
     YOUTUBE_COMMENT = 1
     BLUESKY_COMMENT = 2
     YOUTUBE_SYSTEM  = 3
-    BLUESKY_SYSTEM  = 3
+    BLUESKY_SYSTEM  = 4
+    KIRIBAN         = 5
+    NICO_REPORT     = 6
+    SNACK_TIME      = 7
+    HOT_SPRING      = 8

migrations/2025_10_22_235100_add_transfer_data_to_queries.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+from config import CONFIG
+from eloquent import DatabaseManager, Schema
+
+DB = DatabaseManager (CONFIG)
+SCHEMA = Schema (DB)
+
+
+with SCHEMA.table ('queries') as t:
+    t.json ('transfer_data').nullable ().default (None).comment ('受渡しデータ')

models.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from eloquent import Model
+from eloquent import Model  # type: ignore
+from eloquent.query import QueryBuilder  # type: ignore
 
 from .config import DB
 
@@ -27,16 +28,21 @@ class Answer (Model):
     query_id:       int
     character:      int
     content:        str
-    answer_type:    int
     sent_at:        datetime
 
     __timestamps__ = False
 
     @property
-    def query (
+    def query_rel (
             self,
     ) -> Query:
-        return self.belongs_to (Query)
+        return self.belongs_to (Query, 'query_id')
+
+    @property
+    def answered_flags (
+            self,
+    ) -> list[AnsweredFlag]:
+        return self.has_many (AnsweredFlag)
 
     def answered (
             self,
@@ -60,7 +66,9 @@ class Query (Model):
     model:              int
     sent_at:            datetime
     answered:           bool
+    transfer_data:      dict[str, str] | None
 
+    __casts__ = { 'transfer_data': 'json' }
     __timestamps__ = False
 
     @property
@@ -81,11 +89,13 @@ class QueryAnswerHistory (Model):
     query_id:   int
     answer_id:  int
 
+    __timestamps__ = False
+
     @property
-    def query (
+    def query_rel (
             self,
     ) -> Query:
-        return self.belongs_to (Query)
+        return self.belongs_to (Query, 'query_id')
 
     @property
     def answer (
@@ -100,3 +110,5 @@ class User (Model):
     code:       str
     name:       str
     icon:       bytes
+
+    __timestamps__ = False

queries_to_answers.py

@@ -1,86 +0,0 @@
-from __future__ import annotations
-
-import random
-from datetime import datetime
-from typing import TypedDict
-
-from config import DB
-from consts import AnswerType, Character, Platform
-from models import Answer, AnsweredFlag, Query, User
-from talk import Talk
-
-
-def main (
-) -> None:
-    DB.begin_transaction ()
-    queries: list[Query] = Query.where ('answered', False).get ()
-    if not queries:
-        return
-    query: Query = random.choice (queries)
-    user: User = query.user
-    user_name: str | None = None
-    if query.user_id is not None:
-        user_name = user.name
-    histories: list[History] = []
-    for history in query.answer_histories:
-        if history.query is not None:
-            histories.append ({ 'role': 'user', 'content': history.query.content })
-        histories.append ({ 'role': 'assistant', 'content': history.content })
-    for character in [Character.DEERJIKA, Character.GOATOH]:
-        if query.target_character & character.value:
-            add_answer (query, character, user_name, histories)
-    query.answered = True
-    query.save ()
-    DB.commit ()
-
-
-def add_answer (
-        query:      Query,
-        character:  Character,
-        user_name:  str | None,
-        histories:  list[History],
-) -> None:
-    message: str | list[dict[str, str | dict[str, str]]]
-    if query.image_url is None:
-        message = query.content
-    else:
-        message = [{ 'type': 'text', 'text': query.content },
-                   { 'type': 'image_url', 'image_url': query.image_url }]
-    answer = Answer ()
-    answer.query_id = query.id
-    answer.character = character.value
-    answer.content = Talk.main (message, user_name, histories,
-                                goatoh_mode = character == Character.GOATOH)
-    answer.answer_type = query.query_type
-    answer.sent_at = datetime.now ()
-    answer.save ()
-    add_answered_flags (answer)
-
-
-def add_answered_flags (
-        answer: Answer,
-) -> None:
-    if answer.answer_type in [AnswerType.YOUTUBE_REPLY]:
-        add_answered_flag (answer, Platform.YOUTUBE)
-    if answer.answer_type in [AnswerType.BLUESKY_REPLY]:
-        add_answered_flag (answer, Platform.BLUESKY)
-
-
-def add_answered_flag (
-        answer:     Answer,
-        platform:   Platform,
-) -> None:
-    answered_flag = AnsweredFlag ()
-    answered_flag.answer_id = answer.id
-    answered_flag.platform = platform.value
-    answered_flag.answered = False
-    answered_flag.save ()
-
-
-class History (TypedDict):
-    role:       str
-    content:    str
-
-
-if __name__ == '__main__':
-    main ()

talk.py

@@ -15,7 +15,7 @@ from openai.types.chat import (ChatCompletionAssistantMessageParam,
                                ChatCompletionUserMessageParam)
 from openai.types.chat.chat_completion_message import ChatCompletionMessage
 
-from connection import OPENAI_API_KEY, OPENAI_ORGANISATION  # type: ignore
+from .connection import OPENAI_API_KEY, OPENAI_ORGANISATION  # type: ignore
 
 
 class Talk: