chore(backend): Removed unused model_relationship methods

removed unused AnyModelConfig related methods,
removed unused get_related_model_key_count method.
This commit is contained in:
Lucian Hardy
2025-05-06 16:15:35 +10:00
committed by psychedelicious
parent a4cddfa47d
commit 459491e402
3 changed files with 1 additions and 80 deletions

View File

@@ -1,8 +1,4 @@
from abc import ABC, abstractmethod
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from invokeai.backend.model_manager.config import AnyModelConfig
class ModelRelationshipRecordStorageBase(ABC):
"""Abstract base class for model-to-model relationship record storage."""
@@ -25,33 +21,4 @@ class ModelRelationshipRecordStorageBase(ABC):
@abstractmethod
def get_related_model_keys_batch(self, model_keys: list[str]) -> list[str]:
"""Get related model keys for multiple models given a list of keys."""
pass
@abstractmethod
def get_related_model_key_count(self, model_key: str) -> int:
"""Gets the number of relations for a given model key."""
pass
""" Below are methods that use ModelConfigs instead of model keys, as convenience methods.
These methods are not required to be implemented, but they are potentially useful for later development.
They are not used in the current codebase."""
@abstractmethod
def add_relationship_from_models(self, model_1: "AnyModelConfig", model_2: "AnyModelConfig") -> None:
"""Creates a relationship between two models using ModelConfigs."""
pass
@abstractmethod
def remove_relationship_from_models(self, model_1: "AnyModelConfig", model_2: "AnyModelConfig") -> None:
"""Removes a relationship between two models using ModelConfigs."""
pass
@abstractmethod
def get_related_keys_from_model(self, model: "AnyModelConfig") -> list[str]:
"""Gets all model keys related to a given model using it's config."""
pass
@abstractmethod
def get_related_model_key_count_from_model(self, model: "AnyModelConfig") -> int:
"""Gets the number of relations for a given model config."""
pass

View File

@@ -1,9 +1,6 @@
from invokeai.app.services.shared.sqlite.sqlite_database import SqliteDatabase
import sqlite3
from typing import cast, TYPE_CHECKING
from invokeai.app.services.model_relationship_records.model_relationship_records_base import ModelRelationshipRecordStorageBase
if TYPE_CHECKING:
from invokeai.backend.model_manager.config import AnyModelConfig
class SqliteModelRelationshipRecordStorage(ModelRelationshipRecordStorageBase):
def __init__(self, db: SqliteDatabase) -> None:
@@ -61,29 +58,4 @@ class SqliteModelRelationshipRecordStorage(ModelRelationshipRecordStorageBase):
""",
model_keys + model_keys
)
return [row[0] for row in cursor.fetchall()]
def get_related_model_key_count(self, model_key: str) -> int:
cursor = self._conn.execute(
"""
SELECT COUNT(*) FROM (
SELECT model_key_2 FROM model_relationships WHERE model_key_1 = ?
UNION
SELECT model_key_1 FROM model_relationships WHERE model_key_2 = ?
)
""",
(model_key, model_key),
)
return cast(int, cursor.fetchone()[0])
def add_relationship_from_models(self, model_1: "AnyModelConfig", model_2: "AnyModelConfig") -> None:
self.add_model_relationship(model_1.key, model_2.key)
def remove_relationship_from_models(self, model_1: "AnyModelConfig", model_2: "AnyModelConfig") -> None:
self.remove_model_relationship(model_1.key, model_2.key)
def get_related_keys_from_model(self, model: "AnyModelConfig") -> list[str]:
return self.get_related_model_keys(model.key)
def get_related_model_key_count_from_model(self, model: "AnyModelConfig") -> int:
return self.get_related_model_key_count(model.key)
return [row[0] for row in cursor.fetchall()]

View File

@@ -1,8 +1,5 @@
from abc import ABC, abstractmethod
from invokeai.backend.model_manager.config import AnyModelConfig
class ModelRelationshipsServiceABC(ABC):
"""High-level service for managing model-to-model relationships."""
@@ -24,19 +21,4 @@ class ModelRelationshipsServiceABC(ABC):
@abstractmethod
def get_related_model_keys_batch(self, model_keys: list[str]) -> list[str]:
"""Get related model keys for multiple models."""
pass
@abstractmethod
def add_relationship_from_models(self, model_1: AnyModelConfig, model_2: AnyModelConfig) -> None:
"""Creates a relationship from model objects."""
pass
@abstractmethod
def remove_relationship_from_models(self, model_1: AnyModelConfig, model_2: AnyModelConfig) -> None:
"""Removes a relationship from model objects."""
pass
@abstractmethod
def get_related_keys_from_model(self, model: AnyModelConfig) -> list[str]:
"""Gets all model keys related to a given model object."""
pass