Commit e785402b authored by w-e-w's avatar w-e-w
Browse files

return nothing if not found

parent f5959c1c
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,8 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):


    def create_item(self, name, index=None, enable_filter=True):
    def create_item(self, name, index=None, enable_filter=True):
        lora_on_disk = networks.available_networks.get(name)
        lora_on_disk = networks.available_networks.get(name)
        if lora_on_disk is None:
            return


        path, ext = os.path.splitext(lora_on_disk.filename)
        path, ext = os.path.splitext(lora_on_disk.filename)


@@ -69,7 +71,6 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
        names = list(networks.available_networks)
        names = list(networks.available_networks)
        for index, name in enumerate(names):
        for index, name in enumerate(names):
            item = self.create_item(name, index)
            item = self.create_item(name, index)

            if item is not None:
            if item is not None:
                yield item
                yield item


+6 −1
Original line number Original line Diff line number Diff line
@@ -15,6 +15,9 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):


    def create_item(self, name, index=None, enable_filter=True):
    def create_item(self, name, index=None, enable_filter=True):
        checkpoint: sd_models.CheckpointInfo = sd_models.checkpoint_aliases.get(name)
        checkpoint: sd_models.CheckpointInfo = sd_models.checkpoint_aliases.get(name)
        if checkpoint is None:
            return

        path, ext = os.path.splitext(checkpoint.filename)
        path, ext = os.path.splitext(checkpoint.filename)
        return {
        return {
            "name": checkpoint.name_for_extra,
            "name": checkpoint.name_for_extra,
@@ -32,7 +35,9 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
    def list_items(self):
    def list_items(self):
        names = list(sd_models.checkpoints_list)
        names = list(sd_models.checkpoints_list)
        for index, name in enumerate(names):
        for index, name in enumerate(names):
            yield self.create_item(name, index)
            item = self.create_item(name, index)
            if item is not None:
                yield item


    def allowed_directories_for_previews(self):
    def allowed_directories_for_previews(self):
        return [v for v in [shared.cmd_opts.ckpt_dir, sd_models.model_path] if v is not None]
        return [v for v in [shared.cmd_opts.ckpt_dir, sd_models.model_path] if v is not None]
+7 −2
Original line number Original line Diff line number Diff line
@@ -13,7 +13,10 @@ class ExtraNetworksPageHypernetworks(ui_extra_networks.ExtraNetworksPage):
        shared.reload_hypernetworks()
        shared.reload_hypernetworks()


    def create_item(self, name, index=None, enable_filter=True):
    def create_item(self, name, index=None, enable_filter=True):
        full_path = shared.hypernetworks[name]
        full_path = shared.hypernetworks.get(name)
        if full_path is None:
            return

        path, ext = os.path.splitext(full_path)
        path, ext = os.path.splitext(full_path)
        sha256 = sha256_from_cache(full_path, f'hypernet/{name}')
        sha256 = sha256_from_cache(full_path, f'hypernet/{name}')
        shorthash = sha256[0:10] if sha256 else None
        shorthash = sha256[0:10] if sha256 else None
@@ -33,7 +36,9 @@ class ExtraNetworksPageHypernetworks(ui_extra_networks.ExtraNetworksPage):
    def list_items(self):
    def list_items(self):
        names = list(shared.hypernetworks)
        names = list(shared.hypernetworks)
        for index, name in enumerate(names):
        for index, name in enumerate(names):
            yield self.create_item(name, index)
            item = self.create_item(name, index)
            if item is not None:
                yield item


    def allowed_directories_for_previews(self):
    def allowed_directories_for_previews(self):
        return [shared.cmd_opts.hypernetwork_dir]
        return [shared.cmd_opts.hypernetwork_dir]
+5 −1
Original line number Original line Diff line number Diff line
@@ -14,6 +14,8 @@ class ExtraNetworksPageTextualInversion(ui_extra_networks.ExtraNetworksPage):


    def create_item(self, name, index=None, enable_filter=True):
    def create_item(self, name, index=None, enable_filter=True):
        embedding = sd_hijack.model_hijack.embedding_db.word_embeddings.get(name)
        embedding = sd_hijack.model_hijack.embedding_db.word_embeddings.get(name)
        if embedding is None:
            return


        path, ext = os.path.splitext(embedding.filename)
        path, ext = os.path.splitext(embedding.filename)
        return {
        return {
@@ -31,7 +33,9 @@ class ExtraNetworksPageTextualInversion(ui_extra_networks.ExtraNetworksPage):
    def list_items(self):
    def list_items(self):
        names = list(sd_hijack.model_hijack.embedding_db.word_embeddings)
        names = list(sd_hijack.model_hijack.embedding_db.word_embeddings)
        for index, name in enumerate(names):
        for index, name in enumerate(names):
            yield self.create_item(name, index)
            item = self.create_item(name, index)
            if item is not None:
                yield item


    def allowed_directories_for_previews(self):
    def allowed_directories_for_previews(self):
        return list(sd_hijack.model_hijack.embedding_db.embedding_dirs)
        return list(sd_hijack.model_hijack.embedding_db.embedding_dirs)