Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(nodes): "context_data" -> "data"

Browse Source 
Changed within InvocationContext, for brevity.
This commit is contained in:
psychedelicious 2024-02-18 11:56:54 +11:00
parent fdac0c3c9b
commit ccfe6b6bef
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
invokeai/app/services/session_processor/session_processor_default.py
View File

@ -157,13 +157,13 @@ class DefaultSessionProcessor(SessionProcessorBase):
invocation, self._queue_item.session.id invocation, self._queue_item.session.id
): ):
# Build invocation context (the node-facing API) # Build invocation context (the node-facing API)
context_data = InvocationContextData( data = InvocationContextData(
invocation=invocation, invocation=invocation,
source_invocation_id=source_invocation_id, source_invocation_id=source_invocation_id,
queue_item=self._queue_item, queue_item=self._queue_item,
) )
context = build_invocation_context( context = build_invocation_context(
context_data=context_data, data=data,
services=self._invoker.services, services=self._invoker.services,
cancel_event=self._cancel_event, cancel_event=self._cancel_event,
) )

54
invokeai/app/services/shared/invocation_context.py
View File

@ -58,9 +58,9 @@ class InvocationContextData:
class InvocationContextInterface: class InvocationContextInterface:
def __init__(self, services: InvocationServices, context_data: InvocationContextData) -> None: def __init__(self, services: InvocationServices, data: InvocationContextData) -> None:
self._services = services self._services = services
self._context_data = context_data self._data = data
class BoardsInterface(InvocationContextInterface): class BoardsInterface(InvocationContextInterface):
@ -166,26 +166,26 @@ class ImagesInterface(InvocationContextInterface):
metadata_ = None metadata_ = None
if metadata: if metadata:
metadata_ = metadata metadata_ = metadata
elif isinstance(self._context_data.invocation, WithMetadata): elif isinstance(self._data.invocation, WithMetadata):
metadata_ = self._context_data.invocation.metadata metadata_ = self._data.invocation.metadata
# If `board_id` is provided directly, use that. Else, use the board provided by `WithBoard`, falling back to None. # If `board_id` is provided directly, use that. Else, use the board provided by `WithBoard`, falling back to None.
board_id_ = None board_id_ = None
if board_id: if board_id:
board_id_ = board_id board_id_ = board_id
elif isinstance(self._context_data.invocation, WithBoard) and self._context_data.invocation.board: elif isinstance(self._data.invocation, WithBoard) and self._data.invocation.board:
board_id_ = self._context_data.invocation.board.board_id board_id_ = self._data.invocation.board.board_id
return self._services.images.create( return self._services.images.create(
image=image, image=image,
is_intermediate=self._context_data.invocation.is_intermediate, is_intermediate=self._data.invocation.is_intermediate,
image_category=image_category, image_category=image_category,
board_id=board_id_, board_id=board_id_,
metadata=metadata_, metadata=metadata_,
image_origin=ResourceOrigin.INTERNAL, image_origin=ResourceOrigin.INTERNAL,
workflow=self._context_data.queue_item.workflow, workflow=self._data.queue_item.workflow,
session_id=self._context_data.queue_item.session_id, session_id=self._data.queue_item.session_id,
node_id=self._context_data.invocation.id, node_id=self._data.invocation.id,
) )
def get_pil(self, image_name: str, mode: IMAGE_MODES | None = None) -> Image: def get_pil(self, image_name: str, mode: IMAGE_MODES | None = None) -> Image:
@ -285,7 +285,7 @@ class ModelsInterface(InvocationContextInterface):
# the event payloads. # the event payloads.
return self._services.model_manager.load_model_by_key( return self._services.model_manager.load_model_by_key(
key=key, submodel_type=submodel_type, context_data=self._context_data key=key, submodel_type=submodel_type, context_data=self._data
) )
def load_by_attrs( def load_by_attrs(
@ -304,7 +304,7 @@ class ModelsInterface(InvocationContextInterface):
base_model=base_model, base_model=base_model,
model_type=model_type, model_type=model_type,
submodel=submodel, submodel=submodel,
context_data=self._context_data, context_data=self._data,
) )
def get_config(self, key: str) -> AnyModelConfig: def get_config(self, key: str) -> AnyModelConfig:
@ -364,9 +364,9 @@ class ConfigInterface(InvocationContextInterface):
class UtilInterface(InvocationContextInterface): class UtilInterface(InvocationContextInterface):
def __init__( def __init__(
self, services: InvocationServices, context_data: InvocationContextData, cancel_event: threading.Event self, services: InvocationServices, data: InvocationContextData, cancel_event: threading.Event
) -> None: ) -> None:
super().__init__(services, context_data) super().__init__(services, data)
self._cancel_event = cancel_event self._cancel_event = cancel_event
def is_canceled(self) -> bool: def is_canceled(self) -> bool:
@ -385,7 +385,7 @@ class UtilInterface(InvocationContextInterface):
""" """
stable_diffusion_step_callback( stable_diffusion_step_callback(
context_data=self._context_data, context_data=self._data,
intermediate_state=intermediate_state, intermediate_state=intermediate_state,
base_model=base_model, base_model=base_model,
events=self._services.events, events=self._services.events,
@ -408,7 +408,7 @@ class InvocationContext:
config: ConfigInterface, config: ConfigInterface,
util: UtilInterface, util: UtilInterface,
boards: BoardsInterface, boards: BoardsInterface,
context_data: InvocationContextData, data: InvocationContextData,
services: InvocationServices, services: InvocationServices,
) -> None: ) -> None:
self.images = images self.images = images
@ -427,7 +427,7 @@ class InvocationContext:
"""Provides utility methods.""" """Provides utility methods."""
self.boards = boards self.boards = boards
"""Provides methods to interact with boards.""" """Provides methods to interact with boards."""
self._data = context_data self._data = data
"""Provides data about the current queue item and invocation. This is an internal API and may change without warning.""" """Provides data about the current queue item and invocation. This is an internal API and may change without warning."""
self._services = services self._services = services
"""Provides access to the full application services. This is an internal API and may change without warning.""" """Provides access to the full application services. This is an internal API and may change without warning."""
@ -435,7 +435,7 @@ class InvocationContext:
def build_invocation_context( def build_invocation_context(
services: InvocationServices, services: InvocationServices,
context_data: InvocationContextData, data: InvocationContextData,
cancel_event: threading.Event, cancel_event: threading.Event,
) -> InvocationContext: ) -> InvocationContext:
""" """
@ -445,14 +445,14 @@ def build_invocation_context(
:param invocation_context_data: The invocation context data. :param invocation_context_data: The invocation context data.
""" """
logger = LoggerInterface(services=services, context_data=context_data) logger = LoggerInterface(services=services, data=data)
images = ImagesInterface(services=services, context_data=context_data) images = ImagesInterface(services=services, data=data)
tensors = TensorsInterface(services=services, context_data=context_data) tensors = TensorsInterface(services=services, data=data)
models = ModelsInterface(services=services, context_data=context_data) models = ModelsInterface(services=services, data=data)
config = ConfigInterface(services=services, context_data=context_data) config = ConfigInterface(services=services, data=data)
util = UtilInterface(services=services, context_data=context_data, cancel_event=cancel_event) util = UtilInterface(services=services, data=data, cancel_event=cancel_event)
conditioning = ConditioningInterface(services=services, context_data=context_data) conditioning = ConditioningInterface(services=services, data=data)
boards = BoardsInterface(services=services, context_data=context_data) boards = BoardsInterface(services=services, data=data)
ctx = InvocationContext( ctx = InvocationContext(
images=images, images=images,
@ -460,7 +460,7 @@ def build_invocation_context(
config=config, config=config,
tensors=tensors, tensors=tensors,
models=models, models=models,
context_data=context_data, data=data,
util=util, util=util,
conditioning=conditioning, conditioning=conditioning,
services=services, services=services,

2
tests/test_graph_execution_state.py
View File

@ -86,7 +86,7 @@ def invoke_next(g: GraphExecutionState, services: InvocationServices) -> tuple[B
InvocationContext( InvocationContext(
conditioning=None, conditioning=None,
config=None, config=None,
context_data=None, data=None,
images=None, images=None,
tensors=None, tensors=None,
logger=None, logger=None,