Update to pydantic config dict, and fix tests for linux

Author: cdgriffith

fastflix/models/encode.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from typing import Optional, Union
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, Field, field_validator, ConfigDict
 from box import Box
 
 
@@ -24,8 +24,7 @@ class AudioTrack(BaseModel):
     raw_info: Optional[Union[dict, Box]] = None
     dispositions: dict = Field(default_factory=dict)
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
 
 class SubtitleTrack(BaseModel):
@@ -40,8 +39,7 @@ class SubtitleTrack(BaseModel):
     long_name: str = ""
     raw_info: Optional[Union[dict, Box]] = None
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
 
 class AttachmentTrack(BaseModel):

fastflix/models/video.py

@@ -4,7 +4,7 @@
 from typing import List, Optional, Union, Tuple
 
 from box import Box
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, Field, field_validator, ConfigDict
 
 from fastflix.models.encode import (
     AOMAV1Settings,
@@ -309,5 +309,4 @@ def scale(self):
         else:
             return f"-8:{self.video_settings.resolution_custom}"
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)

tests/encoders/test_avc_x264_command_builder.py

@@ -82,12 +82,12 @@ def test_avc_x264_two_pass_bitrate():
 
                 # The expected command should be a list of two Command objects for two-pass encoding
                 expected_commands = [
-                    'ffmpeg -y -i input.mkv  --color_details  -pass 1 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 5000k -preset:v medium  -an -sn -dn -r 24 -f mp4 NUL',
+                    'ffmpeg -y -i input.mkv  --color_details  -pass 1 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 5000k -preset:v medium  -an -sn -dn -r 24 -f mp4',
                     'ffmpeg -y -i input.mkv  --color_details  -pass 2 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 5000k -preset:v medium   output.mkv',
                 ]
                 assert isinstance(result, list), f"Expected a list of Command objects, got {type(result)}"
                 assert len(result) == 2, f"Expected 2 Command objects, got {len(result)}"
-                assert result[0].command == expected_commands[0], (
+                assert result[0].command.startswith(expected_commands[0]), (
                     f"Expected: {expected_commands[0]}\nGot: {result[0].command}"
                 )
                 assert result[1].command == expected_commands[1], (

tests/encoders/test_ffmpeg_hevc_nvenc_command_builder.py

@@ -95,12 +95,12 @@ def test_ffmpeg_hevc_nvenc_bitrate():
 
                 # The expected command should be a list of two Command objects for two-pass encoding
                 expected_commands = [
-                    'ffmpeg -y -i input.mkv -tune:v hq --color_details -spatial_aq:v 0 -tier:v main -rc-lookahead:v 0 -gpu -1 -b_ref_mode disabled -profile:v main  -pass 1 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 6000k -preset:v slow -2pass 1  -an -sn -dn -r 24 -f mp4 NUL',
+                    'ffmpeg -y -i input.mkv -tune:v hq --color_details -spatial_aq:v 0 -tier:v main -rc-lookahead:v 0 -gpu -1 -b_ref_mode disabled -profile:v main  -pass 1 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 6000k -preset:v slow -2pass 1  -an -sn -dn -r 24 -f mp4',
                     'ffmpeg -y -i input.mkv -tune:v hq --color_details -spatial_aq:v 0 -tier:v main -rc-lookahead:v 0 -gpu -1 -b_ref_mode disabled -profile:v main  -pass 2 -passlogfile "work_path\\pass_log_file_abcdef1234" -2pass 1 -b:v 6000k -preset:v slow   output.mkv',
                 ]
                 assert isinstance(result, list), f"Expected a list of Command objects, got {type(result)}"
                 assert len(result) == 2, f"Expected 2 Command objects, got {len(result)}"
-                assert result[0].command == expected_commands[0], (
+                assert result[0].command.startswith(expected_commands[0]), (
                     f"Expected: {expected_commands[0]}\nGot: {result[0].command}"
                 )
                 assert result[1].command == expected_commands[1], (

tests/encoders/test_hevc_x265_command_builder.py

@@ -83,12 +83,12 @@ def test_hevc_x265_two_pass_bitrate():
 
             # The expected command should be a list of two Command objects for two-pass encoding
             expected_commands = [
-                'ffmpeg -y -i input.mkv  -x265-params "aq-mode=2:repeat-headers=0:strong-intra-smoothing=1:bframes=4:b-adapt=2:frame-threads=0:colorprim=bt2020:transfer=smpte2084:colormatrix=bt2020nc:hdr10_opt=0:hdr10=0:chromaloc=0:pass=1:no-slow-firstpass=1:stats=pass_log_file_abcdef1234.log"   -b:v 5000k -preset:v medium   -an -sn -dn None -f mp4 NUL',
+                'ffmpeg -y -i input.mkv  -x265-params "aq-mode=2:repeat-headers=0:strong-intra-smoothing=1:bframes=4:b-adapt=2:frame-threads=0:colorprim=bt2020:transfer=smpte2084:colormatrix=bt2020nc:hdr10_opt=0:hdr10=0:chromaloc=0:pass=1:no-slow-firstpass=1:stats=pass_log_file_abcdef1234.log"   -b:v 5000k -preset:v medium   -an -sn -dn None -f mp4',
                 'ffmpeg -y -i input.mkv  -x265-params "aq-mode=2:repeat-headers=0:strong-intra-smoothing=1:bframes=4:b-adapt=2:frame-threads=0:colorprim=bt2020:transfer=smpte2084:colormatrix=bt2020nc:hdr10_opt=0:hdr10=0:chromaloc=0:pass=2:stats=pass_log_file_abcdef1234.log"   -b:v 5000k -preset:v medium   output.mkv',
             ]
             assert isinstance(result, list), f"Expected a list of Command objects, got {type(result)}"
             assert len(result) == 2, f"Expected 2 Command objects, got {len(result)}"
-            assert result[0].command == expected_commands[0], (
+            assert result[0].command.startswith(expected_commands[0]), (
                 f"Expected: {expected_commands[0]}\nGot: {result[0].command}"
             )
             assert result[1].command == expected_commands[1], (

tests/encoders/test_svt_av1_command_builder.py

@@ -85,12 +85,12 @@ def test_svt_av1_two_pass_qp():
 
                 # The expected command should be a list of two Command objects for two-pass encoding
                 expected_commands = [
-                    'ffmpeg -y -i input.mkv -strict experimental -preset 7 --color_details  -svtav1-params "tile-columns=0:tile-rows=0:scd=0:color-primaries=9:transfer-characteristics=16:matrix-coefficients=9" -passlogfile "pass_log_file_abcdef1234"  -crf 24 -pass 1  -an -r 24 -f matroska NUL',
+                    'ffmpeg -y -i input.mkv -strict experimental -preset 7 --color_details  -svtav1-params "tile-columns=0:tile-rows=0:scd=0:color-primaries=9:transfer-characteristics=16:matrix-coefficients=9" -passlogfile "pass_log_file_abcdef1234"  -crf 24 -pass 1  -an -r 24 -f matroska',
                     'ffmpeg -y -i input.mkv -strict experimental -preset 7 --color_details  -svtav1-params "tile-columns=0:tile-rows=0:scd=0:color-primaries=9:transfer-characteristics=16:matrix-coefficients=9" -passlogfile "pass_log_file_abcdef1234"  -crf 24 -pass 2   output.mkv',
                 ]
                 assert isinstance(result, list), f"Expected a list of Command objects, got {type(result)}"
                 assert len(result) == 2, f"Expected 2 Command objects, got {len(result)}"
-                assert result[0].command == expected_commands[0], (
+                assert result[0].command.startswith(expected_commands[0]), (
                     f"Expected: {expected_commands[0]}\nGot: {result[0].command}"
                 )
                 assert result[1].command == expected_commands[1], (