✨ (media_describe.py): enhance movement description for explicit genital visibility and sex position identification; bump version to 2.9.5 in pyproject.toml

2025-10-20 14:47:14 -05:00
parent cb6399befe
commit e53fc9b9bc
3 changed files with 11 additions and 4 deletions
@@ -5662,7 +5662,7 @@ Describe the visible environment in rich detail. Include specific colors and tex
 MOVEMENT ({Ordinal} Paragraph)
 Describe body-part–specific movement in 250 words or less, detailing what body parts are visible and what actions they are performing. Focus on physical actions and positions. Use only generic terms like 'woman' or 'man' to describe people. Begin with an overall summary tied to musical rhythm and beat structure (e.g., 'The subject initiates with a hip sway on the downbeat…'). Then narrate movement chronologically using precise action verbs and transitions like 'then', 'as', 'after', and reference timeline markers (early/mid/late beat or second).

-Specify which body parts move and how they articulate (e.g., 'the right arm lifts upward, then sweeps outward; the torso tilts as the knees bend'), including footwork, weight shifts, and alignment with beats. Describe what body parts are doing to themselves or to another person. If sexual activity is present, describe the specific act being performed, focusing exclusively on physical actions and positions - mention where body parts are positioned in relation to each other (e.g., penis in relation to vagina, anal, mouth, etc.). If a white substance shoots from a penis, describe it as the man ejaculating semen.
+Specify which body parts move and how they articulate (e.g., 'the right arm lifts upward, then sweeps outward; the torso tilts as the knees bend'), including footwork, weight shifts, and alignment with beats. Describe what body parts are doing to themselves or to another person. Explicitly identify if genitals are visible (vagina/pussy, penis/dick, or both) and their state or positioning. If sexual activity is present, identify the sex position if obvious (e.g., missionary, doggy style, cowgirl, reverse cowgirl, etc.) and describe the specific act being performed, focusing exclusively on physical actions and positions - mention where body parts are positioned in relation to each other (e.g., penis penetrating vagina, penis in mouth, etc.). If a white substance shoots from a penis, describe it as the man ejaculating semen.

 Include any camera movement (e.g., 'camera pans to follow the torso shift'). Avoid general labels—focus on locomotor and non-locomotor gestures, repetition, rhythm, and choreography phrasing. Always include any buttock or breast movements visible. Do not describe physical appearance, clothing, setting, or background in this paragraph. Do not mention watermarks.
 ```
@@ -5671,6 +5671,8 @@ Include any camera movement (e.g., 'camera pans to follow the torso shift'). Avo

 -   **Unified SFW/NSFW handling**: Single prompt handles both safe-for-work dance/choreography and explicit sexual content
 -   **Body part specificity**: Requires detailed description of which body parts are visible and what they're doing
+-   **Genital visibility identification**: Explicitly identifies if genitals are visible (vagina/pussy, penis/dick, or both) and their state/positioning
+-   **Sex position identification**: When sexual activity is present and position is obvious, identifies it by name (missionary, doggy style, cowgirl, reverse cowgirl, etc.)
 -   **Interpersonal actions**: Describes what body parts are doing to themselves or to another person
 -   **Explicit content support**: When sexual activity is present, describes specific acts and anatomical positioning
 -   **Generic terminology**: Uses only 'woman' or 'man' to describe people (no other identifying characteristics)
@@ -6086,12 +6088,15 @@ Both the paragraph prompt and the JSON field description now use the unified SFW
 -   More precise descriptions of physical actions
 -   Better understanding of spatial relationships
 -   Clearer distinction between self-interaction and interpersonal actions
+-   **Explicit genital visibility identification**: Identifies whether genitals are visible (vagina/pussy, penis/dick, or both) and their state or positioning

 ### Explicit Content Handling

 -   Direct, clear language for sexual acts
 -   Anatomical specificity (penis, vagina, anal, mouth, etc.)
 -   Recognition of sexual context markers (ejaculation)
+-   **Genital identification**: Explicitly states which genitals are visible and their positioning in relation to other body parts
+-   **Sex position identification**: Identifies obvious sex positions by name (missionary, doggy style, cowgirl, reverse cowgirl, etc.) when sexual activity is present

 ### Maintains SFW Capabilities

@@ -6110,6 +6115,8 @@ No changes to node inputs or outputs. The enhanced prompt works automatically wh
 The movement output will now:

 -   Provide detailed body part-specific descriptions for all content types
+-   Explicitly identify if genitals are visible (vagina/pussy, penis/dick, or both) and their state/positioning
+-   Identify sex positions by name when sexual activity is present and position is obvious (missionary, doggy style, cowgirl, etc.)
 -   Naturally adapt language based on whether content is SFW or NSFW
 -   Maintain 250-word limit for conciseness
 -   Focus on actions and positions rather than appearance
@@ -1380,7 +1380,7 @@ Describe the initial pose and body position in the first frame of the video. The
 {paragraph_num}. MOVEMENT ({self._ordinal(paragraph_num)} Paragraph)
 Describe body-part–specific movement detailing what body parts are visible and what actions they are performing. Focus on physical actions and positions. Use only generic terms like 'woman' or 'man' to describe people. Begin with an overall summary tied to musical rhythm and beat structure (e.g., 'The subject initiates with a hip sway on the downbeat…'). Then narrate movement chronologically using precise action verbs and transitions like 'then', 'as', 'after', and reference timeline markers (early/mid/late beat or second). 

-Specify which body parts move and how they articulate (e.g., 'the right arm lifts upward, then sweeps outward; the torso tilts as the knees bend'), including footwork, weight shifts, and alignment with beats. Describe what body parts are doing to themselves or to another person. If sexual activity is present, describe the specific act being performed, focusing exclusively on physical actions and positions - mention where body parts are positioned in relation to each other (e.g., penis in relation to vagina, anal, mouth, etc.). If a white substance shoots from a penis, describe it as the man ejaculating semen. 
+Specify which body parts move and how they articulate (e.g., 'the right arm lifts upward, then sweeps outward; the torso tilts as the knees bend'), including footwork, weight shifts, and alignment with beats. Describe what body parts are doing to themselves or to another person. Explicitly identify if genitals are visible (vagina/pussy, penis/dick, or both) and their state or positioning. If sexual activity is present, identify the sex position if obvious (e.g., missionary, doggy style, cowgirl, reverse cowgirl, etc.) and describe the specific act being performed, focusing exclusively on physical actions and positions - mention where body parts are positioned in relation to each other (e.g., penis penetrating vagina, penis in mouth, etc.). If a white substance shoots from a penis, describe it as the man ejaculating semen. 

 Include any camera movement (e.g., 'camera pans to follow the torso shift'). Avoid general labels—focus on locomotor and non-locomotor gestures, repetition, rhythm, and choreography phrasing. Always include any buttock or breast movements visible. Do not describe physical appearance, clothing, setting, or background in this paragraph. Do not mention watermarks."""
            prompts.append(movement_prompt)
@@ -1447,7 +1447,7 @@ Mood/genre descriptors (e.g., "noir-inspired silhouette," "cinematic realism," e
            if replace_action_with_twerking:
                movement_field = 'Describe the initial pose and body position in the first frame of the video. Then append: "A woman is twerking and shaking her ass. She has a curvy body and a huge ass."'
            else:
-                movement_field = 'Describe body-part–specific movement in 250 words or less, detailing what body parts are visible and what actions they are performing. Focus on physical actions and positions. Use only generic terms like "woman" or "man" to describe people. Start with an overall summary tied to musical rhythm and beat structure (e.g., "The subject initiates with a hip sway on the downbeat…"). Then narrate movement chronologically using precise action verbs and transitions like "then", "as", "after", and reference timeline markers (early/mid/late beat or second). Specify which body parts move and how they articulate (e.g., "the right arm lifts upward, then sweeps outward; the torso tilts as the knees bend"), including footwork, weight shifts, and alignment with beats. Describe what body parts are doing to themselves or to another person. If sexual activity is present, describe the specific act being performed, focusing exclusively on physical actions and positions - mention where body parts are positioned in relation to each other (e.g., penis in relation to vagina, anal, mouth, etc.). If a white substance shoots from a penis, describe it as the man ejaculating semen. Include any camera movement (e.g., "camera pans to follow the torso shift"). Avoid general labels—focus on locomotor and non-locomotor gestures, repetition, rhythm, and choreography phrasing. Always include any buttock or breast movements visible. Do not describe physical appearance, clothing, setting, or background in this paragraph. Do not mention watermarks.'
+                movement_field = 'Describe body-part–specific movement in 250 words or less, detailing what body parts are visible and what actions they are performing. Focus on physical actions and positions. Use only generic terms like "woman" or "man" to describe people. Start with an overall summary tied to musical rhythm and beat structure (e.g., "The subject initiates with a hip sway on the downbeat…"). Then narrate movement chronologically using precise action verbs and transitions like "then", "as", "after", and reference timeline markers (early/mid/late beat or second). Specify which body parts move and how they articulate (e.g., "the right arm lifts upward, then sweeps outward; the torso tilts as the knees bend"), including footwork, weight shifts, and alignment with beats. Describe what body parts are doing to themselves or to another person. Explicitly identify if genitals are visible (vagina/pussy, penis/dick, or both) and their state or positioning. If sexual activity is present, identify the sex position if obvious (e.g., missionary, doggy style, cowgirl, reverse cowgirl, etc.) and describe the specific act being performed, focusing exclusively on physical actions and positions - mention where body parts are positioned in relation to each other (e.g., penis penetrating vagina, penis in mouth, etc.). If a white substance shoots from a penis, describe it as the man ejaculating semen. Include any camera movement (e.g., "camera pans to follow the torso shift"). Avoid general labels—focus on locomotor and non-locomotor gestures, repetition, rhythm, and choreography phrasing. Always include any buttock or breast movements visible. Do not describe physical appearance, clothing, setting, or background in this paragraph. Do not mention watermarks.'

            if describe_bokeh:
                cinematic_field = 'Cover lighting (source/direction/quality/temperature), camera details (shot type, angle/height, movement), optics (lens feel, DOF, rack focus), and exposure/render cues as applicable.'
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "ComfyUI-SwissArmyKnife"
-version = "2.9.4"
+version = "2.9.5"
 description = "A collection of custom nodes for ComfyUI"
 authors = [
  {name = "Sam Kumar", email = "sam@skproductions.llc"}