Refactor: [Server] サーバーの起動に失敗する致命的な不具合を修正

前回コミットでのリグレッションの修正と、LiveStream.py の app.streams 配下への移動

server/app/app.py

@@ -16,7 +16,6 @@
 from app.config import LoadConfig
 from app.constants import CLIENT_DIR, DATABASE_CONFIG, QUALITY, VERSION
 from app.models.Channel import Channel
-from app.models.LiveStream import LiveStream
 from app.models.Program import Program
 from app.models.TwitterAccount import TwitterAccount
 from app.routers import CapturesRouter
@@ -30,6 +29,7 @@
 from app.routers import UsersRouter
 from app.routers import VersionRouter
 from app.routers import VideosRouter
+from app.streams.LiveStream import LiveStream
 from app.utils import Interlaced
 from app.utils import Logging
 from app.utils.EDCB import EDCBTuner

server/app/constants.py

@@ -1,4 +1,5 @@
 
+import pkgutil
 import secrets
 import sys
 from pathlib import Path
@@ -60,14 +61,15 @@
 }
 
 # データベース (Tortoise ORM) の設定
+model_list = [name for _, name, _ in pkgutil.iter_modules(path=['app/models'])]
 DATABASE_CONFIG = {
  'timezone': 'Asia/Tokyo',
  'connections': {
  'default': f'sqlite://{str(DATA_DIR / "database.sqlite")}',
  },
  'apps': {
  'models': {
- 'models': ['app.models', 'aerich.models'],
+ 'models': [f'app.models.{name}' for name in model_list] + ['aerich.models'],
  'default_connection': 'default',
  }
  }

server/app/models/Channel.py

@@ -68,7 +68,7 @@ def is_display(self) -> bool:
  def viewer_count(self) -> int:
  # 現在の視聴者数を取得
  ## 循環参照を防ぐためにここで遅延インポート
- from app.models.LiveStream import LiveStream
+ from app.streams.LiveStream import LiveStream
  return LiveStream.getViewerCount(self.display_channel_id)
 
 

server/app/models/RecordedProgram.py

@@ -1,13 +1,19 @@
 
+# Type Hints を指定できるように
+# ref: https://stackoverflow.com/a/33533514/17124142
+from __future__ import annotations
+
 import json
 from datetime import datetime
 from tortoise import fields
 from tortoise import models
+from typing import TYPE_CHECKING
 
-from app.models.Channel import Channel
-from app.models.RecordedVideo import RecordedVideo
-from app.models.Series import Series
-from app.models.SeriesBroadcastPeriod import SeriesBroadcastPeriod
+if TYPE_CHECKING:
+ from app.models.Channel import Channel
+ from app.models.RecordedVideo import RecordedVideo
+ from app.models.Series import Series
+ from app.models.SeriesBroadcastPeriod import SeriesBroadcastPeriod
 
 
 class RecordedProgram(models.Model):

server/app/models/Series.py

@@ -1,9 +1,15 @@
 
+# Type Hints を指定できるように
+# ref: https://stackoverflow.com/a/33533514/17124142
+from __future__ import annotations
+
 import json
 from tortoise import fields
 from tortoise import models
+from typing import TYPE_CHECKING
 
-from app.models.SeriesBroadcastPeriod import SeriesBroadcastPeriod
+if TYPE_CHECKING:
+ from app.models.SeriesBroadcastPeriod import SeriesBroadcastPeriod
 
 
 class Series(models.Model):

server/app/models/SeriesBroadcastPeriod.py

@@ -1,10 +1,16 @@
 
+# Type Hints を指定できるように
+# ref: https://stackoverflow.com/a/33533514/17124142
+from __future__ import annotations
+
 from tortoise import fields
 from tortoise import models
+from typing import TYPE_CHECKING
 
-from app.models.Channel import Channel
-from app.models.Series import Series
-from app.models.RecordedProgram import RecordedProgram
+if TYPE_CHECKING:
+ from app.models.Channel import Channel
+ from app.models.Series import Series
+ from app.models.RecordedProgram import RecordedProgram
 
 
 class SeriesBroadcastPeriod(models.Model):

server/app/models/TwitterAccount.py

@@ -1,14 +1,19 @@
 
+# Type Hints を指定できるように
+# ref: https://stackoverflow.com/a/33533514/17124142
+from __future__ import annotations
+
 import asyncio
 import json
 import tweepy
 from requests.cookies import RequestsCookieJar
 from tortoise import fields
 from tortoise import models
 from tweepy_authlib import CookieSessionUserHandler
+from typing import TYPE_CHECKING
 
-from app.app import consumer_key, consumer_secret
-from app.models.User import User
+if TYPE_CHECKING:
+ from app.models.User import User
 
 
 class TwitterAccount(models.Model):
@@ -92,6 +97,7 @@ def getTweepyAuthHandler(self) -> tweepy.OAuth1UserHandler | CookieSessionUserHa
 
  # 通常の OAuth 認証の場合
  else:
+ from app.app import consumer_key, consumer_secret
  auth_handler = tweepy.OAuth1UserHandler(
  consumer_key, consumer_secret, self.access_token, self.access_token_secret,
  )

server/app/models/User.py

@@ -1,10 +1,15 @@
 
+# Type Hints を指定できるように
+# ref: https://stackoverflow.com/a/33533514/17124142
+from __future__ import annotations
+
 import json
 from tortoise import fields
 from tortoise import models
-from typing import Any
+from typing import Any, TYPE_CHECKING
 
-from app.models.TwitterAccount import TwitterAccount
+if TYPE_CHECKING:
+ from app.models.TwitterAccount import TwitterAccount
 
 
 class User(models.Model):

server/app/routers/ChannelsRouter.py

@@ -23,8 +23,8 @@
 from app.config import Config
 from app.constants import API_REQUEST_HEADERS, LOGO_DIR, VERSION
 from app.models.Channel import Channel
-from app.models.LiveStream import LiveStream
 from app.routers.UsersRouter import GetCurrentUser
+from app.streams.LiveStream import LiveStream
 from app.utils import Logging
 from app.utils.EDCB import CtrlCmdUtil
 from app.utils.EDCB import EDCBUtil

server/app/routers/LiveStreamsRouter.py

@@ -18,9 +18,9 @@
 from app import schemas
 from app.constants import QUALITY, QUALITY_TYPES
 from app.models.Channel import Channel
-from app.models.LiveStream import LiveStream
-from app.models.LiveStream import LiveStreamClient
-from app.models.LiveStream import LiveStreamStatus
+from app.streams.LiveStream import LiveStream
+from app.streams.LiveStream import LiveStreamClient
+from app.streams.LiveStream import LiveStreamStatus
 from app.utils import Logging
 
 

server/app/routers/TwitterRouter.py

@@ -21,7 +21,6 @@
 from typing import Any, cast, Coroutine
 
 from app import schemas
-from app.app import consumer_key, consumer_secret
 from app.models.TwitterAccount import TwitterAccount
 from app.models.User import User
 from app.routers.UsersRouter import GetCurrentUser
@@ -205,6 +204,7 @@ async def TwitterAuthURLAPI(
  ## oauth/authorize と異なり、すでにアプリ連携している場合は再承認することなくコールバック URL にリダイレクトされる
  ## ref: https://developer.twitter.com/ja/docs/authentication/api-reference/authenticate
  try:
+ from app.app import consumer_key, consumer_secret
  oauth_handler = tweepy.OAuth1UserHandler(consumer_key, consumer_secret, callback=callback_url)
  authorization_url = await asyncio.to_thread(oauth_handler.get_authorization_url, signin_with_twitter=False) # 同期関数なのでスレッド上で実行
  except tweepy.TweepyException:
@@ -291,6 +291,7 @@ async def TwitterAuthCallbackAPI(
 
  # OAuth1UserHandler を初期化
  ## ref: https://docs.tweepy.org/en/latest/authentication.html#legged-oauth
+ from app.app import consumer_key, consumer_secret
  oauth_handler = tweepy.OAuth1UserHandler(consumer_key, consumer_secret)
  oauth_handler.request_token = {
  'oauth_token': twitter_account.access_token,

server/app/streams/LiveEncodingTask.py

@@ -1,22 +1,28 @@
 
+# Type Hints を指定できるように
+# ref: https://stackoverflow.com/a/33533514/17124142
+from __future__ import annotations
+
 import aiofiles
 import aiohttp
 import asyncio
 import os
 import re
 import time
 from aiofiles.threadpool.text import AsyncTextIOWrapper
-from typing import AsyncIterator, cast, Literal
+from typing import AsyncIterator, cast, Literal, TYPE_CHECKING
 
 from app.config import Config
 from app.constants import API_REQUEST_HEADERS, LIBRARY_PATH, LOGS_DIR, QUALITY, QUALITY_TYPES
 from app.models.Channel import Channel
-from app.models.LiveStream import LiveStream
 from app.streams.LiveHLSSegmenter import LiveHLSSegmenter
 from app.streams.LivePSIDataArchiver import LivePSIDataArchiver
 from app.utils import Logging
 from app.utils.EDCB import EDCBTuner, PipeStreamReader
 
+if TYPE_CHECKING:
+ from app.streams.LiveStream import LiveStream
+
 
 class LiveEncodingTask:
 

server/app/models/LiveStream.py → server/app/streams/LiveStream.py

@@ -32,7 +32,6 @@ class LiveStreamStatus(TypedDict):
 class LiveStreamClient():
  """ ライブストリームのクライアントを表すクラス """
 
-
  def __init__(self, livestream: LiveStream, client_type: Literal['mpegts', 'll-hls']) -> None:
  """
  ライブストリーミングクライアントのインスタンスを初期化する