flexget 3.22.0__tar.gz → 3.22.1__tar.gz

{flexget-3.22.0 → flexget-3.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: flexget
-Version: 3.22.0
+Version: 3.22.1
 Summary: FlexGet is a program aimed to automate downloading or processing content (torrents, podcasts, etc.) from different sources like RSS-feeds, html-pages, various sites and more.
 Project-URL: Issue Tracker, https://github.com/Flexget/Flexget/issues
 Project-URL: Forum, https://github.com/Flexget/Flexget/discussions
@@ -238,7 +238,7 @@ Requires-Dist: tzlocal==5.4.4; extra == 'locked'
 Requires-Dist: urllib3==2.8.0; extra == 'locked'
 Requires-Dist: vcrpy==8.3.0; extra == 'locked'
 Requires-Dist: webencodings==0.6.1; extra == 'locked'
-Requires-Dist: werkzeug==3.1.8; extra == 'locked'
+Requires-Dist: werkzeug==3.1.9; extra == 'locked'
 Requires-Dist: win32-setctime==1.2.0; (sys_platform == 'win32') and extra == 'locked'
 Requires-Dist: wrapt==2.4.1; extra == 'locked'
 Requires-Dist: zc-lockfile==4.0; extra == 'locked'

{flexget-3.22.0 → flexget-3.22.1}/flexget/_version.py

@@ -10,4 +10,4 @@ and update the version again for continued development.
 NOTE: Should always have all three parts of the version, even on major and minor bumps. i.e. 4.0.0.dev, not 4.0.dev
 """
 
-__version__ = '3.22.0'
+__version__ = '3.22.1'

{flexget-3.22.0 → flexget-3.22.1}/flexget/components/archive/db.py

@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 import re
 from datetime import datetime, timedelta
 
 from loguru import logger
-from sqlalchemy import Column, DateTime, ForeignKey, Index, Integer, Table, Unicode
+from sqlalchemy import Column, ForeignKey, Index, Table
 from sqlalchemy.exc import NoResultFound
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from flexget import db_schema
 from flexget.event import event
@@ -19,16 +21,16 @@ Base = db_schema.versioned_base('archive', SCHEMA_VER)
 archive_tags_table = Table(
     'archive_entry_tags',
     Base.metadata,
-    Column('entry_id', Integer, ForeignKey('archive_entry.id')),
-    Column('tag_id', Integer, ForeignKey('archive_tag.id')),
+    Column('entry_id', ForeignKey('archive_entry.id')),
+    Column('tag_id', ForeignKey('archive_tag.id')),
     Index('ix_archive_tags', 'entry_id', 'tag_id'),
 )
 
 archive_sources_table = Table(
     'archive_entry_sources',
     Base.metadata,
-    Column('entry_id', Integer, ForeignKey('archive_entry.id')),
-    Column('source_id', Integer, ForeignKey('archive_source.id')),
+    Column('entry_id', ForeignKey('archive_entry.id')),
+    Column('source_id', ForeignKey('archive_source.id')),
     Index('ix_archive_sources', 'entry_id', 'source_id'),
 )
 
@@ -40,21 +42,20 @@ class ArchiveEntry(Base):
     __tablename__ = 'archive_entry'
     __table_args__ = (Index('ix_archive_title_url', 'title', 'url'),)
 
-    id = Column(Integer, primary_key=True)
-    title = Column(Unicode, index=True)
-    url = Column(Unicode, index=True)
-    description = Column(Unicode)
-    task = Column('feed', Unicode)  # DEPRECATED, but SQLite does not support drop column
-    added = Column(DateTime, index=True)
-
-    tags = relationship('ArchiveTag', secondary=archive_tags_table)
-    sources = relationship(
-        'ArchiveSource', secondary=archive_sources_table, backref='archive_entries'
+    id: Mapped[int] = mapped_column(primary_key=True)
+    title: Mapped[str | None] = mapped_column(index=True)
+    url: Mapped[str | None] = mapped_column(index=True)
+    description: Mapped[str | None]
+    task: Mapped[str | None] = mapped_column(
+        'feed'
+    )  # DEPRECATED, but SQLite does not support drop column
+    added: Mapped[datetime | None] = mapped_column(index=True, default=datetime.now)
+
+    tags: Mapped[list[ArchiveTag]] = relationship(secondary=archive_tags_table)
+    sources: Mapped[list[ArchiveSource]] = relationship(
+        secondary=archive_sources_table, back_populates='archive_entries'
     )
 
-    def __init__(self):
-        self.added = datetime.now()
-
     def __str__(self):
         return '<ArchiveEntry(title={},url={},task={},added={})>'.format(
             self.title,
@@ -67,8 +68,8 @@ class ArchiveEntry(Base):
 class ArchiveTag(Base):
     __tablename__ = 'archive_tag'
 
-    id = Column(Integer, primary_key=True)
-    name = Column(Unicode, index=True)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    name: Mapped[str | None] = mapped_column(index=True)
 
     def __init__(self, name):
         self.name = name
@@ -80,8 +81,11 @@ class ArchiveTag(Base):
 class ArchiveSource(Base):
     __tablename__ = 'archive_source'
 
-    id = Column(Integer, primary_key=True)
-    name = Column(Unicode, index=True)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    name: Mapped[str | None] = mapped_column(index=True)
+    archive_entries: Mapped[list[ArchiveEntry]] = relationship(
+        secondary=archive_sources_table, back_populates='sources'
+    )
 
     def __init__(self, name):
         self.name = name

{flexget-3.22.0 → flexget-3.22.1}/flexget/components/backlog/db.py

@@ -2,7 +2,8 @@ import pickle
 from datetime import datetime
 
 from loguru import logger
-from sqlalchemy import Column, DateTime, Index, Integer, String, Unicode, column, select
+from sqlalchemy import Index, Unicode, column, select
+from sqlalchemy.orm import Mapped, mapped_column
 
 from flexget import db_schema
 from flexget.entry import Entry
@@ -17,11 +18,11 @@ Base = db_schema.versioned_base('backlog', 3)
 class BacklogEntry(Base):
     __tablename__ = 'backlog'
 
-    id = Column(Integer, primary_key=True)
-    task = Column('feed', String)
-    title = Column(String)
-    expire = Column(DateTime)
-    _json = Column('json', Unicode)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    task: Mapped[str | None] = mapped_column('feed')
+    title: Mapped[str | None]
+    expire: Mapped[datetime | None]
+    _json: Mapped[str | None] = mapped_column('json')
     entry = entry_synonym('_json')
 
     def __repr__(self):

{flexget-3.22.0 → flexget-3.22.1}/flexget/components/failed/db.py

@@ -1,7 +1,8 @@
 from datetime import datetime, timedelta
 
 from loguru import logger
-from sqlalchemy import Column, DateTime, Integer, String, Unicode
+from sqlalchemy import DateTime, Unicode
+from sqlalchemy.orm import Mapped, mapped_column
 from sqlalchemy.schema import Index
 
 from flexget import db_schema
@@ -31,19 +32,18 @@ def upgrade(ver, session):
 class FailedEntry(Base):
     __tablename__ = 'failed'
 
-    id = Column(Integer, primary_key=True)
-    title = Column(Unicode)
-    url = Column(String)
-    tof = Column(DateTime)
-    reason = Column(Unicode)
-    count = Column(Integer, default=1)
-    retry_time = Column(DateTime)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    title: Mapped[str | None]
+    url: Mapped[str | None]
+    tof: Mapped[datetime | None] = mapped_column(default=datetime.now)
+    reason: Mapped[str | None]
+    count: Mapped[int | None] = mapped_column(default=1)
+    retry_time: Mapped[datetime | None]
 
     def __init__(self, title, url, reason=None):
         self.title = title
         self.url = url
         self.reason = reason
-        self.tof = datetime.now()
 
     def __str__(self):
         return f'<Failed(title={self.title})>'

{flexget-3.22.0 → flexget-3.22.1}/flexget/components/history/db.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 
 from loguru import logger
-from sqlalchemy import Column, DateTime, Integer, String, Unicode
+from sqlalchemy.orm import Mapped, mapped_column
 
 from flexget.event import event
 from flexget.manager import Base
@@ -12,16 +12,13 @@ logger = logger.bind(name='history.db')
 class History(Base):
     __tablename__ = 'history'
 
-    id = Column(Integer, primary_key=True)
-    task = Column('feed', String)
-    filename = Column(String)
-    url = Column(String)
-    title = Column(Unicode)
-    time = Column(DateTime)
-    details = Column(String)
-
-    def __init__(self):
-        self.time = datetime.now()
+    id: Mapped[int] = mapped_column(primary_key=True)
+    task: Mapped[str | None] = mapped_column('feed')
+    filename: Mapped[str | None]
+    url: Mapped[str | None]
+    title: Mapped[str | None]
+    time: Mapped[datetime | None] = mapped_column(default=datetime.now)
+    details: Mapped[str | None]
 
     def __str__(self):
         return f'<History(filename={self.filename},task={self.task})>'

{flexget-3.22.0 → flexget-3.22.1}/flexget/components/imdb/db.py

@@ -1,8 +1,10 @@
+from __future__ import annotations
+
 from datetime import datetime, timedelta
 
 from loguru import logger
-from sqlalchemy import Boolean, Column, DateTime, Float, Integer, String, Table, Unicode
-from sqlalchemy.orm import relationship
+from sqlalchemy import Column, Table
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey, Index
 
 from flexget import db_schema
@@ -19,8 +21,8 @@ Base = db_schema.versioned_base('imdb_lookup', SCHEMA_VER)
 genres_table = Table(
     'imdb_movie_genres',
     Base.metadata,
-    Column('movie_id', Integer, ForeignKey('imdb_movies.id')),
-    Column('genre_id', Integer, ForeignKey('imdb_genres.id')),
+    Column('movie_id', ForeignKey('imdb_movies.id')),
+    Column('genre_id', ForeignKey('imdb_genres.id')),
     Index('ix_imdb_movie_genres', 'movie_id', 'genre_id'),
 )
 Base.register_table(genres_table)
@@ -28,8 +30,8 @@ Base.register_table(genres_table)
 actors_table = Table(
     'imdb_movie_actors',
     Base.metadata,
-    Column('movie_id', Integer, ForeignKey('imdb_movies.id')),
-    Column('actor_id', Integer, ForeignKey('imdb_actors.id')),
+    Column('movie_id', ForeignKey('imdb_movies.id')),
+    Column('actor_id', ForeignKey('imdb_actors.id')),
     Index('ix_imdb_movie_actors', 'movie_id', 'actor_id'),
 )
 Base.register_table(actors_table)
@@ -37,8 +39,8 @@ Base.register_table(actors_table)
 directors_table = Table(
     'imdb_movie_directors',
     Base.metadata,
-    Column('movie_id', Integer, ForeignKey('imdb_movies.id')),
-    Column('director_id', Integer, ForeignKey('imdb_directors.id')),
+    Column('movie_id', ForeignKey('imdb_movies.id')),
+    Column('director_id', ForeignKey('imdb_directors.id')),
     Index('ix_imdb_movie_directors', 'movie_id', 'director_id'),
 )
 Base.register_table(directors_table)
@@ -46,8 +48,8 @@ Base.register_table(directors_table)
 writers_table = Table(
     'imdb_movie_writers',
     Base.metadata,
-    Column('movie_id', Integer, ForeignKey('imdb_movies.id')),
-    Column('writer_id', Integer, ForeignKey('imdb_writers.id')),
+    Column('movie_id', ForeignKey('imdb_movies.id')),
+    Column('writer_id', ForeignKey('imdb_writers.id')),
     Index('ix_imdb_movie_writers', 'movie_id', 'writer_id'),
 )
 Base.register_table(writers_table)
@@ -55,8 +57,8 @@ Base.register_table(writers_table)
 plot_keywords_table = Table(
     'imdb_movie_plot_keywords',
     Base.metadata,
-    Column('movie_id', Integer, ForeignKey('imdb_movies.id')),
-    Column('keyword_id', Integer, ForeignKey('imdb_plot_keywords.id')),
+    Column('movie_id', ForeignKey('imdb_movies.id')),
+    Column('keyword_id', ForeignKey('imdb_plot_keywords.id')),
     Index('ix_imdb_movie_plot_keywords', 'movie_id', 'keyword_id'),
 )
 Base.register_table(plot_keywords_table)
@@ -65,30 +67,34 @@ Base.register_table(plot_keywords_table)
 class Movie(Base):
     __tablename__ = 'imdb_movies'
 
-    id = Column(Integer, primary_key=True)
-    title = Column(Unicode)
-    original_title = Column(Unicode)
-    url = Column(String, index=True)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    title: Mapped[str | None]
+    original_title: Mapped[str | None]
+    url: Mapped[str | None] = mapped_column(index=True)
 
     # many-to-many relations
-    genres = relationship('Genre', secondary=genres_table, backref='movies')
-    actors = relationship('Actor', secondary=actors_table, backref='movies')
-    directors = relationship('Director', secondary=directors_table, backref='movies')
-    writers = relationship('Writer', secondary=writers_table, backref='movies')
-    plot_keywords = relationship('PlotKeyword', secondary=plot_keywords_table, backref='movies')
-    languages = relationship('MovieLanguage', order_by='MovieLanguage.prominence')
-
-    score = Column(Float)
-    votes = Column(Integer)
-    meta_score = Column(Integer)
-    year = Column(Integer)
-    plot_outline = Column(Unicode)
-    mpaa_rating = Column(String, default='')
-    photo = Column(String)
+    genres: Mapped[list[Genre]] = relationship(secondary=genres_table, back_populates='movies')
+    actors: Mapped[list[Actor]] = relationship(secondary=actors_table, back_populates='movies')
+    directors: Mapped[list[Director]] = relationship(
+        secondary=directors_table, back_populates='movies'
+    )
+    writers: Mapped[list[Writer]] = relationship(secondary=writers_table, back_populates='movies')
+    plot_keywords: Mapped[list[PlotKeyword]] = relationship(
+        secondary=plot_keywords_table, back_populates='movies'
+    )
+    languages: Mapped[list[MovieLanguage]] = relationship(order_by='MovieLanguage.prominence')
+
+    score: Mapped[float | None]
+    votes: Mapped[int | None]
+    meta_score: Mapped[int | None]
+    year: Mapped[int | None]
+    plot_outline: Mapped[str | None]
+    mpaa_rating: Mapped[str | None] = mapped_column(default='')
+    photo: Mapped[str | None]
 
     # updated time, so we can grab new rating counts after 48 hours
     # set a default, so existing data gets updated with a rating
-    updated = Column(DateTime)
+    updated: Mapped[datetime | None]
 
     @property
     def imdb_id(self):
@@ -115,11 +121,11 @@ class Movie(Base):
 class MovieLanguage(Base):
     __tablename__ = 'imdb_movie_languages'
 
-    movie_id = Column(Integer, ForeignKey('imdb_movies.id'), primary_key=True)
-    language_id = Column(Integer, ForeignKey('imdb_languages.id'), primary_key=True)
-    prominence = Column(Integer)
+    movie_id: Mapped[int] = mapped_column(ForeignKey('imdb_movies.id'), primary_key=True)
+    language_id: Mapped[int] = mapped_column(ForeignKey('imdb_languages.id'), primary_key=True)
+    prominence: Mapped[int | None]
 
-    language = relationship('Language')
+    language: Mapped[Language] = relationship()
 
     def __init__(self, language, prominence=None):
         self.language = language
@@ -129,8 +135,8 @@ class MovieLanguage(Base):
 class Language(Base):
     __tablename__ = 'imdb_languages'
 
-    id = Column(Integer, primary_key=True)
-    name = Column(Unicode)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    name: Mapped[str | None]
 
     def __init__(self, name):
         self.name = name
@@ -139,8 +145,9 @@ class Language(Base):
 class Genre(Base):
     __tablename__ = 'imdb_genres'
 
-    id = Column(Integer, primary_key=True)
-    name = Column(String)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    name: Mapped[str | None]
+    movies: Mapped[list[Movie]] = relationship(secondary=genres_table, back_populates='genres')
 
     def __init__(self, name):
         self.name = name
@@ -149,9 +156,10 @@ class Genre(Base):
 class Actor(Base):
     __tablename__ = 'imdb_actors'
 
-    id = Column(Integer, primary_key=True)
-    imdb_id = Column(String)
-    name = Column(Unicode)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    imdb_id: Mapped[str | None]
+    name: Mapped[str | None]
+    movies: Mapped[list[Movie]] = relationship(secondary=actors_table, back_populates='actors')
 
     def __init__(self, imdb_id, name=None):
         self.imdb_id = imdb_id
@@ -161,9 +169,12 @@ class Actor(Base):
 class Director(Base):
     __tablename__ = 'imdb_directors'
 
-    id = Column(Integer, primary_key=True)
-    imdb_id = Column(String)
-    name = Column(Unicode)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    imdb_id: Mapped[str | None]
+    name: Mapped[str | None]
+    movies: Mapped[list[Movie]] = relationship(
+        secondary=directors_table, back_populates='directors'
+    )
 
     def __init__(self, imdb_id, name=None):
         self.imdb_id = imdb_id
@@ -173,9 +184,10 @@ class Director(Base):
 class Writer(Base):
     __tablename__ = 'imdb_writers'
 
-    id = Column(Integer, primary_key=True)
-    imdb_id = Column(String)
-    name = Column(Unicode)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    imdb_id: Mapped[str | None]
+    name: Mapped[str | None]
+    movies: Mapped[list[Movie]] = relationship(secondary=writers_table, back_populates='writers')
 
     def __init__(self, imdb_id, name=None):
         self.imdb_id = imdb_id
@@ -185,8 +197,11 @@ class Writer(Base):
 class PlotKeyword(Base):
     __tablename__ = 'imdb_plot_keywords'
 
-    id = Column(Integer, primary_key=True)
-    name = Column(String)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    name: Mapped[str | None]
+    movies: Mapped[list[Movie]] = relationship(
+        secondary=plot_keywords_table, back_populates='plot_keywords'
+    )
 
     def __init__(self, name):
         self.name = name
@@ -195,11 +210,11 @@ class PlotKeyword(Base):
 class SearchResult(Base):
     __tablename__ = 'imdb_search'
 
-    id = Column(Integer, primary_key=True)
-    title = Column(Unicode, index=True)
-    url = Column(String)
-    fails = Column(Boolean, default=False)
-    queried = Column(DateTime)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    title: Mapped[str | None] = mapped_column(index=True)
+    url: Mapped[str | None]
+    fails: Mapped[bool | None] = mapped_column(default=False)
+    queried: Mapped[datetime | None] = mapped_column(default=datetime.now)
 
     @property
     def imdb_id(self):
@@ -208,7 +223,6 @@ class SearchResult(Base):
     def __init__(self, title, url=None):
         self.title = title
         self.url = url
-        self.queried = datetime.now()
 
     def __repr__(self):
         return f'<SearchResult(title={self.title},url={self.url},fails={self.fails})>'

{flexget-3.22.0 → flexget-3.22.1}/flexget/components/managed_lists/lists/entry_list/db.py

@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 import pickle
 from collections.abc import MutableSet
 from datetime import datetime
 
 from loguru import logger
-from sqlalchemy import Column, DateTime, ForeignKey, Integer, Unicode, func, or_, select
-from sqlalchemy.orm import relationship
+from sqlalchemy import ForeignKey, Unicode, func, or_, select
+from sqlalchemy.orm import DynamicMapped, Mapped, mapped_column, relationship
 from sqlalchemy.sql.elements import and_
 
 from flexget import db_schema
@@ -60,11 +62,11 @@ def upgrade(ver, session):
 
 class EntryListList(Base):
     __tablename__ = 'entry_list_lists'
-    id = Column(Integer, primary_key=True)
-    name = Column(Unicode, unique=True)
-    added = Column(DateTime, default=datetime.now)
-    entries = relationship(
-        'EntryListEntry', backref='list', cascade='all, delete, delete-orphan', lazy='dynamic'
+    id: Mapped[int] = mapped_column(primary_key=True)
+    name: Mapped[str | None] = mapped_column(unique=True)
+    added: Mapped[datetime | None] = mapped_column(default=datetime.now)
+    entries: DynamicMapped[EntryListEntry] = relationship(
+        back_populates='list_', cascade='all, delete-orphan'
     )
 
     def to_dict(self):
@@ -73,12 +75,13 @@ class EntryListList(Base):
 
 class EntryListEntry(Base):
     __tablename__ = 'entry_list_entries'
-    id = Column(Integer, primary_key=True)
-    list_id = Column(Integer, ForeignKey(EntryListList.id), nullable=False)
-    added = Column(DateTime, default=datetime.now)
-    title = Column(Unicode)
-    original_url = Column(Unicode)
-    _json = Column('json', Unicode)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    list_id: Mapped[int] = mapped_column(ForeignKey(EntryListList.id))
+    added: Mapped[datetime | None] = mapped_column(default=datetime.now)
+    title: Mapped[str | None]
+    original_url: Mapped[str | None]
+    _json: Mapped[str | None] = mapped_column('json')
+    list_: Mapped[EntryListList] = relationship(back_populates='entries')
     entry = entry_synonym('_json')
 
     def __init__(self, entry, entry_list_id):

{flexget-3.22.0 → flexget-3.22.1}/flexget/components/managed_lists/lists/imdb_list.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import csv
 import re
 from collections.abc import MutableSet
@@ -10,8 +12,7 @@ import pendulum
 from loguru import logger
 from requests.exceptions import RequestException
 from requests.utils import cookiejar_from_dict
-from sqlalchemy import Column, String, Unicode
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey
 
 from flexget import db_schema, plugin
@@ -37,12 +38,14 @@ OTHER_TYPES = ['videogame']
 class IMDBListUser(Base):
     __tablename__ = 'imdb_list_user'
 
-    user_id = Column(String, primary_key=True)
-    user_name = Column(Unicode)
-    _cookies = Column('cookies', Unicode)
+    user_id: Mapped[str] = mapped_column(primary_key=True)
+    user_name: Mapped[str | None]
+    _cookies: Mapped[str | None] = mapped_column('cookies')
     cookies = json_synonym('_cookies')
 
-    lists = relationship('IMDBListList', backref='imdb_user', cascade='all, delete, delete-orphan')
+    lists: Mapped[list[IMDBListList]] = relationship(
+        back_populates='imdb_user', cascade='all, delete-orphan'
+    )
 
     def __init__(self, user_name, user_id, cookies):
         self.user_name = user_name
@@ -53,9 +56,10 @@ class IMDBListUser(Base):
 class IMDBListList(Base):
     __tablename__ = 'imdb_list_lists'
 
-    list_id = Column(Unicode, primary_key=True)
-    list_name = Column(Unicode)
-    user_id = Column(String, ForeignKey('imdb_list_user.user_id'))
+    list_id: Mapped[str] = mapped_column(primary_key=True)
+    list_name: Mapped[str | None]
+    user_id: Mapped[str] = mapped_column(ForeignKey('imdb_list_user.user_id'))
+    imdb_user: Mapped[IMDBListUser] = relationship(back_populates='lists')
 
     def __init__(self, list_id, list_name, user_id):
         self.list_id = list_id

{flexget-3.22.0 → flexget-3.22.1}/flexget/components/managed_lists/lists/movie_list/db.py

@@ -1,8 +1,10 @@
+from __future__ import annotations
+
 from datetime import datetime
 
 from loguru import logger
-from sqlalchemy import Column, DateTime, ForeignKey, Integer, Unicode, func
-from sqlalchemy.orm import relationship
+from sqlalchemy import ForeignKey, func
+from sqlalchemy.orm import DynamicMapped, Mapped, mapped_column, relationship
 from sqlalchemy.sql.elements import and_
 
 from flexget import plugin
@@ -26,11 +28,11 @@ class MovieListBase:
 
 class MovieListList(Base):
     __tablename__ = 'movie_list_lists'
-    id = Column(Integer, primary_key=True)
-    name = Column(Unicode, unique=True)
-    added = Column(DateTime, default=datetime.now)
-    movies = relationship(
-        'MovieListMovie', backref='list', cascade='all, delete, delete-orphan', lazy='dynamic'
+    id: Mapped[int] = mapped_column(primary_key=True)
+    name: Mapped[str | None] = mapped_column(unique=True)
+    added: Mapped[datetime | None] = mapped_column(default=datetime.now)
+    movies: DynamicMapped[MovieListMovie] = relationship(
+        back_populates='list_', cascade='all, delete-orphan'
     )
 
     def __repr__(self):
@@ -42,12 +44,15 @@ class MovieListList(Base):
 
 class MovieListMovie(Base):
     __tablename__ = 'movie_list_movies'
-    id = Column(Integer, primary_key=True)
-    added = Column(DateTime, default=datetime.now)
-    title = Column(Unicode)
-    year = Column(Integer)
-    list_id = Column(Integer, ForeignKey(MovieListList.id), nullable=False)
-    ids = relationship('MovieListID', backref='movie', cascade='all, delete, delete-orphan')
+    id: Mapped[int] = mapped_column(primary_key=True)
+    added: Mapped[datetime | None] = mapped_column(default=datetime.now)
+    title: Mapped[str | None]
+    year: Mapped[int | None]
+    list_id: Mapped[int] = mapped_column(ForeignKey(MovieListList.id))
+    list_: Mapped[MovieListList] = relationship(back_populates='movies')
+    ids: Mapped[list[MovieListID]] = relationship(
+        back_populates='movie', cascade='all, delete-orphan'
+    )
 
     def __repr__(self):
         return f'<MovieListMovie title={self.title},year={self.year},list_id={self.list_id}>'
@@ -83,11 +88,12 @@ class MovieListMovie(Base):
 
 class MovieListID(Base):
     __tablename__ = 'movie_list_ids'
-    id = Column(Integer, primary_key=True)
-    added = Column(DateTime, default=datetime.now)
-    id_name = Column(Unicode)
-    id_value = Column(Unicode)
-    movie_id = Column(Integer, ForeignKey(MovieListMovie.id))
+    id: Mapped[int] = mapped_column(primary_key=True)
+    added: Mapped[datetime | None] = mapped_column(default=datetime.now)
+    id_name: Mapped[str | None]
+    id_value: Mapped[str | None]
+    movie_id: Mapped[int | None] = mapped_column(ForeignKey(MovieListMovie.id))
+    movie: Mapped[MovieListMovie | None] = relationship(back_populates='ids')
 
     def __repr__(self):
         return f'<MovieListID id_name={self.id_name},id_value={self.id_value},movie_id={self.movie_id}>'