From 9b22030a735f1cbef66fd1d73efff8ee9d80a03f Mon Sep 17 00:00:00 2001 From: Johngdae Date: Tue, 19 Sep 2023 12:02:18 +0000 Subject: [PATCH 1/3] fix) Fix combinedMemory --- src/backend/langflow/interface/run.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/backend/langflow/interface/run.py b/src/backend/langflow/interface/run.py index 9d3d95cda..1aff2f0e2 100644 --- a/src/backend/langflow/interface/run.py +++ b/src/backend/langflow/interface/run.py @@ -58,8 +58,12 @@ def get_memory_key(langchain_object): "chat_history": "history", "history": "chat_history", } - memory_key = langchain_object.memory.memory_key - return mem_key_dict.get(memory_key) + # Check if memory_key attribute exists + if hasattr(langchain_object.memory, 'memory_key'): + memory_key = langchain_object.memory.memory_key + return mem_key_dict.get(memory_key) + else: + return None # or some other default value or action def update_memory_keys(langchain_object, possible_new_mem_key): @@ -86,4 +90,5 @@ def update_memory_keys(langchain_object, possible_new_mem_key): try: setattr(langchain_object.memory, attr, key) except ValueError as exc: - logger.debug(f"{langchain_object.memory} has no attribute {attr} ({exc})") + logger.debug( + f"{langchain_object.memory} has no attribute {attr} ({exc})") From f788659278c4aa886fb80a029cb464f4ec83f2c5 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 19 Sep 2023 11:29:51 -0300 Subject: [PATCH 2/3] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20chore(pyproject.toml):?= =?UTF-8?q?=20add=20pytest-sugar=20as=20a=20development=20dependency=20to?= =?UTF-8?q?=20improve=20test=20reporting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poetry.lock | 35 ++++++++++++++++++++++++++++++++++- pyproject.toml | 1 + 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 855fb26dc..da0fcfa61 100644 --- a/poetry.lock +++ b/poetry.lock @@ -5209,6 +5209,25 @@ pytest = ">=5.0" [package.extras] dev = ["pre-commit", "pytest-asyncio", "tox"] +[[package]] +name = "pytest-sugar" +version = "0.9.7" +description = "pytest-sugar is a plugin for pytest that changes the default look and feel of pytest (e.g. progressbar, show tests that fail instantly)." +optional = false +python-versions = "*" +files = [ + {file = "pytest-sugar-0.9.7.tar.gz", hash = "sha256:f1e74c1abfa55f7241cf7088032b6e378566f16b938f3f08905e2cf4494edd46"}, + {file = "pytest_sugar-0.9.7-py2.py3-none-any.whl", hash = "sha256:8cb5a4e5f8bbcd834622b0235db9e50432f4cbd71fef55b467fe44e43701e062"}, +] + +[package.dependencies] +packaging = ">=21.3" +pytest = ">=6.2.0" +termcolor = ">=2.1.0" + +[package.extras] +dev = ["black", "flake8", "pre-commit"] + [[package]] name = "pytest-xdist" version = "3.3.1" @@ -6421,6 +6440,20 @@ files = [ [package.extras] doc = ["reno", "sphinx", "tornado (>=4.5)"] +[[package]] +name = "termcolor" +version = "2.3.0" +description = "ANSI color formatting for output in terminal" +optional = false +python-versions = ">=3.7" +files = [ + {file = "termcolor-2.3.0-py3-none-any.whl", hash = "sha256:3afb05607b89aed0ffe25202399ee0867ad4d3cb4180d98aaf8eefa6a5f7d475"}, + {file = "termcolor-2.3.0.tar.gz", hash = "sha256:b5b08f68937f138fe92f6c089b99f1e2da0ae56c52b78bf7075fd95420fd9a5a"}, +] + +[package.extras] +tests = ["pytest", "pytest-cov"] + [[package]] name = "textual" version = "0.36.0" @@ -7706,4 +7739,4 @@ local = ["ctransformers", "llama-cpp-python", "sentence-transformers"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.11" -content-hash = "9bba57838ae5e7402973bcbce46977e4ddc4bfc32b494019476959475f737edd" +content-hash = "7aac1af43e599106fa9e6ee38978d014608b0275b277201d605484e675c00cea" diff --git a/pyproject.toml b/pyproject.toml index abe2c9b23..84f35098b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -109,6 +109,7 @@ pytest-mock = "^3.11.1" pytest-xdist = "^3.3.1" types-pywin32 = "^306.0.0.4" types-google-cloud-ndb = "^2.2.0.0" +pytest-sugar = "^0.9.7" [tool.poetry.extras] From a63a79d90ae680a3bd1a962eb4335b4d68035529 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 19 Sep 2023 11:30:03 -0300 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A5=20refactor(test=5Fllms=5Ftempl?= =?UTF-8?q?ate.py):=20remove=20unused=20test=5Fllms=5Fsettings=20test=20ca?= =?UTF-8?q?se?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The test_llms_settings test case is no longer needed as it is not being used and does not provide any value to the test suite. Removing it to improve code cleanliness and maintainability. --- tests/test_llms_template.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/test_llms_template.py b/tests/test_llms_template.py index 14e151479..5bae17a5f 100644 --- a/tests/test_llms_template.py +++ b/tests/test_llms_template.py @@ -2,15 +2,6 @@ from fastapi.testclient import TestClient from langflow.services.utils import get_settings_manager -def test_llms_settings(client: TestClient, logged_in_headers): - settings_manager = get_settings_manager() - response = client.get("api/v1/all", headers=logged_in_headers) - assert response.status_code == 200 - json_response = response.json() - llms = json_response["llms"] - assert set(llms.keys()) == set(settings_manager.settings.LLMS) - - # def test_hugging_face_hub(client: TestClient): # response = client.get("api/v1/all") # assert response.status_code == 200