Remove more old logic

invoke-ai · Jun 17, 2023 · d443c9d · d443c9d
1 parent 956a6aa
commit d443c9d
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 437 deletions.
diff --git a/invokeai/app/invocations/generate.py b/invokeai/app/invocations/generate.py
@@ -12,7 +12,7 @@
 from invokeai.app.util.misc import SEED_MAX, get_random_seed
 from invokeai.backend.generator.inpaint import infill_methods
 
-from ...backend.generator import Img2Img, Inpaint, InvokeAIGenerator, Txt2Img
+from ...backend.generator import Inpaint, InvokeAIGenerator
 from ...backend.stable_diffusion import PipelineIntermediateState
 from ..util.step_callback import stable_diffusion_step_callback
 from .baseinvocation import BaseInvocation, InvocationConfig, InvocationContext

diff --git a/invokeai/backend/__init__.py b/invokeai/backend/__init__.py
@@ -5,7 +5,6 @@
     InvokeAIGeneratorBasicParams,
     InvokeAIGenerator,
     InvokeAIGeneratorOutput,
-    Txt2Img,
     Img2Img,
     Inpaint
 )

diff --git a/invokeai/backend/generator/__init__.py b/invokeai/backend/generator/__init__.py
@@ -5,7 +5,6 @@
     InvokeAIGenerator,
     InvokeAIGeneratorBasicParams,
     InvokeAIGeneratorOutput,
-    Txt2Img,
     Img2Img,
     Inpaint,
     Generator,

diff --git a/invokeai/backend/generator/base.py b/invokeai/backend/generator/base.py
@@ -175,13 +175,6 @@ def _generator_class(cls)->Type[Generator]:
         '''
         return Generator
 
-# ------------------------------------
-class Txt2Img(InvokeAIGenerator):
-    @classmethod
-    def _generator_class(cls):
-        from .txt2img import Txt2Img
-        return Txt2Img
-
 # ------------------------------------
 class Img2Img(InvokeAIGenerator):
     def generate(self,
@@ -235,24 +228,6 @@ def _generator_class(cls):
         from .inpaint import Inpaint
         return Inpaint
 
-# ------------------------------------
-class Embiggen(Txt2Img):
-    def generate(
-            self,
-            embiggen: list=None,
-            embiggen_tiles: list = None,
-            strength: float=0.75,
-            **kwargs)->Iterator[InvokeAIGeneratorOutput]:
-        return super().generate(embiggen=embiggen,
-                                embiggen_tiles=embiggen_tiles,
-                                strength=strength,
-                                **kwargs)
-
-    @classmethod
-    def _generator_class(cls):
-        from .embiggen import Embiggen
-        return Embiggen
-
 class Generator:
     downsampling_factor: int
     latent_channels: int

diff --git a/invokeai/backend/stable_diffusion/__init__.py b/invokeai/backend/stable_diffusion/__init__.py
@@ -1,7 +1,6 @@
 """
 Initialization file for the invokeai.backend.stable_diffusion package
 """
-from .concepts_lib import HuggingFaceConceptsLibrary
 from .diffusers_pipeline import (
     ConditioningData,
     PipelineIntermediateState,

diff --git a/invokeai/backend/stable_diffusion/concepts_lib.py b/invokeai/backend/stable_diffusion/concepts_lib.py
diff --git a/invokeai/backend/stable_diffusion/diffusers_pipeline.py b/invokeai/backend/stable_diffusion/diffusers_pipeline.py
@@ -340,7 +340,7 @@ def __init__(
             # control_model=control_model,
         )
         self.invokeai_diffuser = InvokeAIDiffuserComponent(
-            self.unet, self._unet_forward, is_running_diffusers=True
+            self.unet, self._unet_forward
         )
 
         self._model_group = FullyLoadedModelGroup(execution_device or self.unet.device)