Rename clip1 to clip (#3822)

## What type of PR is this? (check all applicable)

- [x] Refactor
- [ ] Feature
- [ ] Bug Fix
- [ ] Optimization
- [ ] Documentation Update
This commit is contained in:
blessedcoolant 2023-07-19 04:09:38 +12:00 committed by GitHub
commit b4eeaaa63c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -331,8 +331,8 @@ class SDXLCompelPromptInvocation(BaseInvocation, SDXLPromptInvocationBase):
crop_left: int = Field(0, description="") crop_left: int = Field(0, description="")
target_width: int = Field(1024, description="") target_width: int = Field(1024, description="")
target_height: int = Field(1024, description="") target_height: int = Field(1024, description="")
clip1: ClipField = Field(None, description="Clip to use") clip: ClipField = Field(None, description="Clip to use")
clip2: ClipField = Field(None, description="Clip to use") clip2: ClipField = Field(None, description="Clip2 to use")
# Schema customisation # Schema customisation
class Config(InvocationConfig): class Config(InvocationConfig):
@ -348,7 +348,7 @@ class SDXLCompelPromptInvocation(BaseInvocation, SDXLPromptInvocationBase):
@torch.no_grad() @torch.no_grad()
def invoke(self, context: InvocationContext) -> CompelOutput: def invoke(self, context: InvocationContext) -> CompelOutput:
c1, c1_pooled, ec1 = self.run_clip_compel(context, self.clip1, self.prompt, False) c1, c1_pooled, ec1 = self.run_clip_compel(context, self.clip, self.prompt, False)
if self.style.strip() == "": if self.style.strip() == "":
c2, c2_pooled, ec2 = self.run_clip_compel(context, self.clip2, self.prompt, True) c2, c2_pooled, ec2 = self.run_clip_compel(context, self.clip2, self.prompt, True)
else: else:
@ -451,8 +451,8 @@ class SDXLRawPromptInvocation(BaseInvocation, SDXLPromptInvocationBase):
crop_left: int = Field(0, description="") crop_left: int = Field(0, description="")
target_width: int = Field(1024, description="") target_width: int = Field(1024, description="")
target_height: int = Field(1024, description="") target_height: int = Field(1024, description="")
clip1: ClipField = Field(None, description="Clip to use") clip: ClipField = Field(None, description="Clip to use")
clip2: ClipField = Field(None, description="Clip to use") clip2: ClipField = Field(None, description="Clip2 to use")
# Schema customisation # Schema customisation
class Config(InvocationConfig): class Config(InvocationConfig):
@ -468,7 +468,7 @@ class SDXLRawPromptInvocation(BaseInvocation, SDXLPromptInvocationBase):
@torch.no_grad() @torch.no_grad()
def invoke(self, context: InvocationContext) -> CompelOutput: def invoke(self, context: InvocationContext) -> CompelOutput:
c1, c1_pooled, ec1 = self.run_clip_raw(context, self.clip1, self.prompt, False) c1, c1_pooled, ec1 = self.run_clip_raw(context, self.clip, self.prompt, False)
if self.style.strip() == "": if self.style.strip() == "":
c2, c2_pooled, ec2 = self.run_clip_raw(context, self.clip2, self.prompt, True) c2, c2_pooled, ec2 = self.run_clip_raw(context, self.clip2, self.prompt, True)
else: else: