#8

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

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

@@ -3,6 +3,7 @@ from __future__ import annotations
 from datetime import datetime
 
 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
@@ -84,10 +92,10 @@ class QueryAnswerHistory (Model):
     __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 (

talk.py

@@ -266,10 +266,7 @@ class Talk:
 
         try:
             return (openai.chat.completions.create (
-                        model    = ('gpt-4o'
+                        model    = 'gpt-6-luna',
-                                    if any (type (e['content']) is list
-                                            for e in messages)
-                                    else 'gpt-3.5-turbo'),
                         messages = messages)
                     .choices[0].message)
         except: