jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into dev

Browse source
This commit is contained in:
Gabriel Luiz Freitas Almeida 2023-06-18 08:44:23 -03:00
commit 74278ba1c7
3 changed files with 9 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/backend/langflow/processing/process.py
View file

@ -109,23 +109,13 @@ def get_result_and_thought(langchain_object, message: str):
return result, thought return result, thought
def load_or_build_langchain_object(data_graph, is_first_message=False):
"""
Load langchain object from cache if it exists, otherwise build it.
"""
if is_first_message:
build_langchain_object_with_caching.clear_cache()
return build_langchain_object_with_caching(data_graph)
def process_graph_cached(data_graph: Dict[str, Any], message: str): def process_graph_cached(data_graph: Dict[str, Any], message: str):
""" """
Process graph by extracting input variables and replacing ZeroShotPrompt Process graph by extracting input variables and replacing ZeroShotPrompt
with PromptTemplate,then run the graph and return the result and thought. with PromptTemplate,then run the graph and return the result and thought.
""" """
# Load langchain object # Load langchain object
is_first_message = len(data_graph.get("chatHistory", [])) == 0 langchain_object = build_langchain_object_with_caching(data_graph)
langchain_object = load_or_build_langchain_object(data_graph, is_first_message)
logger.debug("Loaded langchain object") logger.debug("Loaded langchain object")
if langchain_object is None: if langchain_object is None:

13
tests/test_cache.py
View file

@ -1,6 +1,5 @@
import json import json
from langflow.graph import Graph from langflow.graph import Graph
from langflow.processing.process import load_or_build_langchain_object
import pytest import pytest
from langflow.interface.run import ( from langflow.interface.run import (
@ -41,18 +40,6 @@ def langchain_objects_are_equal(obj1, obj2):
return str(obj1) == str(obj2) return str(obj1) == str(obj2)
# Test load_or_build_langchain_object
def test_load_or_build_langchain_object_first_message_true(basic_data_graph):
build_langchain_object_with_caching.clear_cache()
graph = load_or_build_langchain_object(basic_data_graph, is_first_message=True)
assert graph is not None
def test_load_or_build_langchain_object_first_message_false(basic_data_graph):
graph = load_or_build_langchain_object(basic_data_graph, is_first_message=False)
assert graph is not None
# Test build_langchain_object_with_caching # Test build_langchain_object_with_caching
def test_build_langchain_object_with_caching(basic_data_graph): def test_build_langchain_object_with_caching(basic_data_graph):
build_langchain_object_with_caching.clear_cache() build_langchain_object_with_caching.clear_cache()

16
tests/test_websocket.py
View file

@ -13,15 +13,15 @@ def test_init_build(client):
assert response.json() == {"flowId": "test"} assert response.json() == {"flowId": "test"}
def test_stream_build(client): # def test_stream_build(client):
client.post( # client.post(
"api/v1/build/init", json={"id": "stream_test", "data": {"key": "value"}} # "api/v1/build/init", json={"id": "stream_test", "data": {"key": "value"}}
) # )
# Test the stream # # Test the stream
response = client.get("api/v1/build/stream/stream_test") # response = client.get("api/v1/build/stream/stream_test")
assert response.status_code == 200 # assert response.status_code == 200
assert response.headers["content-type"] == "text/event-stream; charset=utf-8" # assert response.headers["content-type"] == "text/event-stream; charset=utf-8"
def test_websocket_endpoint(client): def test_websocket_endpoint(client):