From 74b723c4da2c748ae251bc87db5a879d494a3699 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 1 Mar 2024 17:13:20 -0300 Subject: [PATCH] Refactor variable names and fix typo in code --- src/backend/langflow/api/v1/chat.py | 10 +++++----- src/backend/langflow/api/v1/schemas.py | 6 ++++-- src/backend/langflow/graph/graph/base.py | 8 ++++---- src/backend/langflow/graph/vertex/base.py | 6 +++--- src/frontend/src/stores/flowStore.ts | 16 ++++++++++++---- src/frontend/src/types/api/index.ts | 2 +- src/frontend/src/utils/buildUtils.ts | 16 +++++++--------- 7 files changed, 36 insertions(+), 28 deletions(-) diff --git a/src/backend/langflow/api/v1/chat.py b/src/backend/langflow/api/v1/chat.py index 258277bca..7126c19e3 100644 --- a/src/backend/langflow/api/v1/chat.py +++ b/src/backend/langflow/api/v1/chat.py @@ -153,14 +153,14 @@ async def build_vertex( result_data_response.duration = duration result_data_response.timedelta = timedelta vertex.add_build_time(timedelta) - inactive_vertices = None - if graph.inactive_vertices: - inactive_vertices = list(graph.inactive_vertices) - graph.reset_inactive_vertices() + inactivated_vertices = None + if graph.inactivated_vertices: + inactivated_vertices = list(graph.inactivated_vertices) + graph.reset_inactivated_vertices() chat_service.set_cache(flow_id, graph) build_response = VertexBuildResponse( - inactive_vertices=inactive_vertices, + inactivated_vertices=inactivated_vertices, valid=valid, params=params, id=vertex.id, diff --git a/src/backend/langflow/api/v1/schemas.py b/src/backend/langflow/api/v1/schemas.py index 80d40007b..044d98507 100644 --- a/src/backend/langflow/api/v1/schemas.py +++ b/src/backend/langflow/api/v1/schemas.py @@ -158,7 +158,9 @@ class StreamData(BaseModel): data: dict def __str__(self) -> str: - return f"event: {self.event}\ndata: {orjson_dumps(self.data, indent_2=False)}\n\n" + return ( + f"event: {self.event}\ndata: {orjson_dumps(self.data, indent_2=False)}\n\n" + ) class CustomComponentCode(BaseModel): @@ -227,7 +229,7 @@ class ResultDataResponse(BaseModel): class VertexBuildResponse(BaseModel): id: Optional[str] = None - inactive_vertices: Optional[List[str]] = None + inactivated_vertices: Optional[List[str]] = None valid: bool params: Optional[str] """JSON string of the params.""" diff --git a/src/backend/langflow/graph/graph/base.py b/src/backend/langflow/graph/graph/base.py index 245a8a4ae..0b5af21f6 100644 --- a/src/backend/langflow/graph/graph/base.py +++ b/src/backend/langflow/graph/graph/base.py @@ -54,7 +54,7 @@ class Graph: self._vertices = self._graph_data["nodes"] self._edges = self._graph_data["edges"] - self.inactive_vertices: set = set() + self.inactivated_vertices: set = set() self.edges: List[ContractEdge] = [] self.vertices: List[Vertex] = [] self._build_graph() @@ -137,7 +137,7 @@ class Graph: return { "runs": self._runs, "updates": self._updates, - "inactive_vertices": self.inactive_vertices, + "inactivated_vertices": self.inactivated_vertices, } def build_graph_maps(self): @@ -145,8 +145,8 @@ class Graph: self.in_degree_map = self.build_in_degree() self.parent_child_map = self.build_parent_child_map() - def reset_inactive_vertices(self): - self.inactive_vertices = set() + def reset_inactivated_vertices(self): + self.inactivated_vertices = set() def mark_all_vertices(self, state: str): """Marks all vertices in the graph.""" diff --git a/src/backend/langflow/graph/vertex/base.py b/src/backend/langflow/graph/vertex/base.py index 6425f5e08..a550b5b0f 100644 --- a/src/backend/langflow/graph/vertex/base.py +++ b/src/backend/langflow/graph/vertex/base.py @@ -103,12 +103,12 @@ class Vertex: ): # If the vertex is inactive and has only one in degree # it means that it is not a merge point in the graph - self.graph.inactive_vertices.add(self.id) + self.graph.inactivated_vertices.add(self.id) elif ( self.state == VertexStates.ACTIVE - and self.id in self.graph.inactive_vertices + and self.id in self.graph.inactivated_vertices ): - self.graph.inactive_vertices.remove(self.id) + self.graph.inactivated_vertices.remove(self.id) @property def avg_build_time(self): diff --git a/src/frontend/src/stores/flowStore.ts b/src/frontend/src/stores/flowStore.ts index 1725de2a0..9ee25623b 100644 --- a/src/frontend/src/stores/flowStore.ts +++ b/src/frontend/src/stores/flowStore.ts @@ -219,8 +219,16 @@ const useFlowStore = create((set, get) => ({ ); }, paste: (selection, position) => { - if(selection.nodes.some((node) => node.data.type === "ChatInput") && checkChatInput(get().nodes)){ - useAlertStore.getState().setErrorData({title: "Error pasting components", list: ["You can only have one ChatInput component in the flow"]}); + if ( + selection.nodes.some((node) => node.data.type === "ChatInput") && + checkChatInput(get().nodes) + ) { + useAlertStore + .getState() + .setErrorData({ + title: "Error pasting components", + list: ["You can only have one ChatInput component in the flow"], + }); return; } let minimumX = Infinity; @@ -440,8 +448,8 @@ const useFlowStore = create((set, get) => ({ status: BuildStatus, buildId: string ) { - if (vertexBuildData && vertexBuildData.inactive_vertices) { - get().removeFromVerticesBuild(vertexBuildData.inactive_vertices); + if (vertexBuildData && vertexBuildData.inactivated_vertices) { + get().removeFromVerticesBuild(vertexBuildData.inactivated_vertices); } get().addDataToFlowPool( { ...vertexBuildData, buildId }, diff --git a/src/frontend/src/types/api/index.ts b/src/frontend/src/types/api/index.ts index 6663692dc..27e5946b3 100644 --- a/src/frontend/src/types/api/index.ts +++ b/src/frontend/src/types/api/index.ts @@ -140,7 +140,7 @@ export type VerticesOrderTypeAPI = { export type VertexBuildTypeAPI = { id: string; - inactive_vertices: Array | null; + inactivated_vertices: Array | null; valid: boolean; params: string; data: VertexDataTypeAPI; diff --git a/src/frontend/src/utils/buildUtils.ts b/src/frontend/src/utils/buildUtils.ts index e5003caf2..1ce675eec 100644 --- a/src/frontend/src/utils/buildUtils.ts +++ b/src/frontend/src/utils/buildUtils.ts @@ -31,7 +31,7 @@ function getInactiveVertexData(vertexId: string): VertexBuildTypeAPI { id: vertexId, data: inactiveData, params: "Inactive", - inactive_vertices: null, + inactivated_vertices: null, valid: false, timestamp: new Date().toISOString(), }; @@ -85,14 +85,12 @@ export async function updateVerticesOrder( } const verticesIds = verticesLayers.flat(); - useFlowStore - .getState() - .updateVerticesBuild({ - verticesLayers, - verticesIds, - verticesOrder, - runId, - }); + useFlowStore.getState().updateVerticesBuild({ + verticesLayers, + verticesIds, + verticesOrder, + runId, + }); resolve({ verticesLayers, verticesIds, verticesOrder, runId }); }); }