Merge pull request #1 from jhj0517/feature/make-enum

app.py

@@ -39,7 +39,7 @@ class App:
             gr.Slider(label=_("Source Ratio"), minimum=0, maximum=1, step=0.01, value=1),
             gr.Slider(label=_("Sample Ratio"), minimum=-0.2, maximum=1.2, step=0.01, value=1),
             gr.Dropdown(label=_("Sample Parts"),
-                        choices=["OnlyExpression", "OnlyRotation", "OnlyMouth", "OnlyEyes", "All"], value="All"),
+                        choices=[part.value for part in SamplePart], value=SamplePart.ALL.value),
             gr.Slider(label=_("Crop Factor"), minimum=1.5, maximum=2.5, step=0.1, value=1.7)
         ]
 

i18n/translation.yaml

@@ -18,6 +18,11 @@ en: # English
   Sample Ratio: Sample Ratio
   Sample Parts: Sample Parts
   Crop Factor: Crop Factor
+  OnlyExpression: OnlyExpression
+  OnlyRotation: OnlyRotation
+  OnlyMouth: OnlyMouth
+  OnlyEyes: OnlyEyes
+  All: All
 
 ko: # Korean
   Language: 언어
@@ -35,10 +40,15 @@ ko: # Korean
   EEE: 이이이
   WOO: 우우우
   Smile: 미소
-  Source Ratio: 원본 비율
+  Source Ratio: 원본 반영 비율
   Sample Ratio: 샘플 비율
   Sample Parts: 샘플 파트
   Crop Factor: Crop Factor
+  OnlyExpression: 표정만
+  OnlyRotation: 회전만
+  OnlyMouth: 입만
+  OnlyEyes: 눈만
+  All: 전부
 
 ja: # Japanese
   Language: 言語
@@ -60,6 +70,11 @@ ja: # Japanese
   Sample Ratio: Sample Ratio
   Sample Parts: Sample Parts
   Crop Factor: Crop Factor
+  OnlyExpression: OnlyExpression
+  OnlyRotation: OnlyRotation
+  OnlyMouth: OnlyMouth
+  OnlyEyes: OnlyEyes
+  All: All
 
 es: # Spanish
   Language: Idioma
@@ -81,6 +96,11 @@ es: # Spanish
   Sample Ratio: Sample Ratio
   Sample Parts: Sample Parts
   Crop Factor: Crop Factor
+  OnlyExpression: OnlyExpression
+  OnlyRotation: OnlyRotation
+  OnlyMouth: OnlyMouth
+  OnlyEyes: OnlyEyes
+  All: All
 
 fr: # French
   Language: Langue
@@ -102,6 +122,11 @@ fr: # French
   Sample Ratio: Sample Ratio
   Sample Parts: Sample Parts
   Crop Factor: Crop Factor
+  OnlyExpression: OnlyExpression
+  OnlyRotation: OnlyRotation
+  OnlyMouth: OnlyMouth
+  OnlyEyes: OnlyEyes
+  All: All
 
 de: # German
   Language: Sprache
@@ -123,6 +148,11 @@ de: # German
   Sample Ratio: Sample Ratio
   Sample Parts: Sample Parts
   Crop Factor: Crop Factor
+  OnlyExpression: OnlyExpression
+  OnlyRotation: OnlyRotation
+  OnlyMouth: OnlyMouth
+  OnlyEyes: OnlyEyes
+  All: All
 
 zh: # Chinese
   Language: 语言
@@ -144,6 +174,11 @@ zh: # Chinese
   Sample Ratio: Sample Ratio
   Sample Parts: Sample Parts
   Crop Factor: Crop Factor
+  OnlyExpression: OnlyExpression
+  OnlyRotation: OnlyRotation
+  OnlyMouth: OnlyMouth
+  OnlyEyes: OnlyEyes
+  All: All
 
 uk: # Ukrainian
   Language: Мова
@@ -165,6 +200,11 @@ uk: # Ukrainian
   Sample Ratio: Sample Ratio
   Sample Parts: Sample Parts
   Crop Factor: Crop Factor
+  OnlyExpression: OnlyExpression
+  OnlyRotation: OnlyRotation
+  OnlyMouth: OnlyMouth
+  OnlyEyes: OnlyEyes
+  All: All
 
 ru: # Russian
   Language: Язык
@@ -186,6 +226,11 @@ ru: # Russian
   Sample Ratio: Sample Ratio
   Sample Parts: Sample Parts
   Crop Factor: Crop Factor
+  OnlyExpression: OnlyExpression
+  OnlyRotation: OnlyRotation
+  OnlyMouth: OnlyMouth
+  OnlyEyes: OnlyEyes
+  All: All
 
 tr: # Turkish
   Language: Dil
@@ -207,3 +252,8 @@ tr: # Turkish
   Sample Ratio: Sample Ratio
   Sample Parts: Sample Parts
   Crop Factor: Crop Factor
+  OnlyExpression: OnlyExpression
+  OnlyRotation: OnlyRotation
+  OnlyMouth: OnlyMouth
+  OnlyEyes: OnlyEyes
+  All: All

modules/live_portrait/live_portrait_inferencer.py

@@ -201,15 +201,15 @@ class LivePortraitInferencer:
                     self.d_info['exp'][0, 5, 1] = 0
 
                 # "OnlyExpression", "OnlyRotation", "OnlyMouth", "OnlyEyes", "All"
-                if sample_parts == "OnlyExpression" or sample_parts == "All":
+                if sample_parts == SamplePart.ONLY_EXPRESSION.value or sample_parts == SamplePart.ONLY_EXPRESSION.ALL.value:
                     es.e += self.d_info['exp'] * sample_ratio
-                if sample_parts == "OnlyRotation" or sample_parts == "All":
+                if sample_parts == SamplePart.ONLY_ROTATION.value or sample_parts == SamplePart.ONLY_ROTATION.ALL.value:
                     rotate_pitch += self.d_info['pitch'] * sample_ratio
                     rotate_yaw += self.d_info['yaw'] * sample_ratio
                     rotate_roll += self.d_info['roll'] * sample_ratio
-                elif sample_parts == "OnlyMouth":
+                elif sample_parts == SamplePart.ONLY_MOUTH.value:
                     self.retargeting(es.e, self.d_info['exp'], sample_ratio, (14, 17, 19, 20))
-                elif sample_parts == "OnlyEyes":
+                elif sample_parts == SamplePart.ONLY_EYES.value:
                     self.retargeting(es.e, self.d_info['exp'], sample_ratio, (1, 2, 11, 13, 15, 16))
 
             es.r = self.calc_fe(es.e, blink, eyebrow, wink, pupil_x, pupil_y, aaa, eee, woo, smile,

modules/utils/constants.py

@@ -7,6 +7,14 @@ class ModelType(Enum):
     ANIMAL = _("Animal")
 
 
+class SamplePart(Enum):
+    ONLY_EXPRESSION = _("OnlyExpression")
+    ONLY_ROTATION = _("OnlyRotation")
+    ONLY_MOUTH = _("OnlyMouth")
+    ONLY_EYES = _("OnlyEyes")
+    ALL = _("All")
+
+
 REPO_MARKDOWN = """
 ## [AdvancedLivePortrait-WebUI](https://github.com/jhj0517/AdvancedLivePortrait-WebUI/tree/master)
 """