From a43260fca8ad0fcf3c573aa7a3df8e0ced221e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Di=C3=B3genes=20Betat=20Roos?= Date: Thu, 17 Aug 2023 18:57:47 +0000 Subject: [PATCH 001/134] Add build folder to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3b6cfebbf..156f44394 100644 --- a/.gitignore +++ b/.gitignore @@ -253,3 +253,4 @@ langflow.db .docusaurus/ /tmp/* +src/backend/langflow/frontend/ From ff7c3c26ef480637f8656180609de104c21ec4b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Di=C3=B3genes=20Betat=20Roos?= Date: Thu, 17 Aug 2023 19:12:21 +0000 Subject: [PATCH 002/134] Migrate Chroma to Custom Component --- .../components/vectorstores/Chroma.py | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 src/backend/langflow/components/vectorstores/Chroma.py diff --git a/src/backend/langflow/components/vectorstores/Chroma.py b/src/backend/langflow/components/vectorstores/Chroma.py new file mode 100644 index 000000000..d064af80e --- /dev/null +++ b/src/backend/langflow/components/vectorstores/Chroma.py @@ -0,0 +1,69 @@ +from typing import Optional, Union +from langflow import CustomComponent + +from langchain.vectorstores import Chroma +from langchain.schema import Document +from langchain.vectorstores.base import VectorStore +from langchain.schema import BaseRetriever +from langchain.embeddings.base import Embeddings + + +class ChromaComponent(CustomComponent): + """ + A custom component for implementing a Vector Store using Chroma. + """ + + display_name: str = "Chroma (Custom Component)" + description: str = "Implementation of Vector Store using Chroma" + documentation = "https://python.langchain.com/docs/integrations/vectorstores/chroma" + beta = True + + def build_config(self): + """ + Builds the configuration for the component. + + Returns: + - dict: A dictionary containing the configuration options for the component. + """ + return { + "collection_name": {"display_name": "Collection Name", "value": "langflow"}, + "persist": {"display_name": "Persist"}, + "persist_directory": {"display_name": "Persist Directory"}, + "code": {"show": False, "display_name": "Code"}, + "documents": {"display_name": "Documents", "is_list": True}, + "embedding": {"display_name": "Embedding"}, + } + + def build( + self, + collection_name: str, + persist: bool, + persist_directory: Optional[str] = None, + embedding: Optional[Embeddings] = None, + documents: Optional[Document] = None, + ) -> Union[VectorStore, BaseRetriever]: + """ + Builds the Vector Store or BaseRetriever object. + + Args: + - collection_name (str): The name of the collection. + - persist_directory (Optional[str]): The directory to persist the Vector Store to. + - persist (bool): Whether to persist the Vector Store or not. + - embedding (Optional[Embeddings]): The embeddings to use for the Vector Store. + - documents (Optional[Document]): The documents to use for the Vector Store. + + Returns: + - Union[VectorStore, BaseRetriever]: The Vector Store or BaseRetriever object. + """ + # If documents, then we need to create a Chroma instance using .from_documents + if documents is not None and embedding is not None: + return Chroma.from_documents( + documents=documents, # type: ignore + persist_directory=persist_directory if persist else None, + collection_name=collection_name, + embedding=embedding, + ) + + return Chroma( + persist_directory=persist_directory, + ) From b772bbe9763d1d84c39f3916624835f30532e056 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 17 Aug 2023 22:33:52 -0300 Subject: [PATCH 003/134] =?UTF-8?q?=F0=9F=90=9B=20fix(endpoints.py):=20add?= =?UTF-8?q?=20validation=20to=20ensure=20that=20custom=20components=20are?= =?UTF-8?q?=20in=20a=20single=20category?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/endpoints.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/backend/langflow/api/v1/endpoints.py b/src/backend/langflow/api/v1/endpoints.py index ca5e1c5c9..56ca36d6f 100644 --- a/src/backend/langflow/api/v1/endpoints.py +++ b/src/backend/langflow/api/v1/endpoints.py @@ -57,6 +57,13 @@ def get_all(): logger.info(f"Loading {len(custom_component_dicts)} category(ies)") for custom_component_dict in custom_component_dicts: # custom_component_dict is a dict of dicts + if len(custom_component_dict) > 1: + raise ValueError( + f"Custom components must be in a single category. Found {len(custom_component_dict)} categories" + ) + elif len(custom_component_dict) == 0: + continue + category = list(custom_component_dict.keys())[0] logger.info( f"Loading {len(custom_component_dict[category])} component(s) from category {category}" From d76cef81e84ffed5447965f76ed222c181d4c1e1 Mon Sep 17 00:00:00 2001 From: ogabrielluiz Date: Thu, 17 Aug 2023 23:11:44 -0300 Subject: [PATCH 004/134] fix: Remove category log --- src/backend/langflow/api/v1/endpoints.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/backend/langflow/api/v1/endpoints.py b/src/backend/langflow/api/v1/endpoints.py index 56ca36d6f..1e1524222 100644 --- a/src/backend/langflow/api/v1/endpoints.py +++ b/src/backend/langflow/api/v1/endpoints.py @@ -56,18 +56,6 @@ def get_all(): logger.info(f"Loading {len(custom_component_dicts)} category(ies)") for custom_component_dict in custom_component_dicts: - # custom_component_dict is a dict of dicts - if len(custom_component_dict) > 1: - raise ValueError( - f"Custom components must be in a single category. Found {len(custom_component_dict)} categories" - ) - elif len(custom_component_dict) == 0: - continue - - category = list(custom_component_dict.keys())[0] - logger.info( - f"Loading {len(custom_component_dict[category])} component(s) from category {category}" - ) logger.debug(custom_component_dict) custom_components_from_file = merge_nested_dicts_with_renaming( custom_components_from_file, custom_component_dict From ee52095f61a82c049e740a11613791e284d77c2c Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 17 Aug 2023 23:30:15 -0300 Subject: [PATCH 005/134] =?UTF-8?q?=F0=9F=94=A5=20chore(package.json):=20r?= =?UTF-8?q?emove=20devDependencies=20from=20package.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔖 chore(pyproject.toml): bump version to 0.4.12 --- package-lock.json | 1551 --------------------------------------------- package.json | 5 - poetry.lock | 457 ++----------- pyproject.toml | 2 +- 4 files changed, 67 insertions(+), 1948 deletions(-) delete mode 100644 package-lock.json delete mode 100644 package.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 46c31a07c..000000000 --- a/package-lock.json +++ /dev/null @@ -1,1551 +0,0 @@ -{ - "name": "langflow", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "devDependencies": { - "@svgr/cli": "^8.0.1" - } - }, - "node_modules/@ampproject/remapping": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", - "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", - "dev": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", - "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", - "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", - "dev": true, - "dependencies": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.9", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.8", - "@babel/types": "^7.22.5", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/generator": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", - "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz", - "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", - "browserslist": "^4.21.9", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", - "dev": true, - "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", - "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", - "dev": true, - "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", - "@babel/helper-simple-access": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", - "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", - "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", - "dev": true, - "dependencies": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.6", - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", - "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/parser": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", - "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.22.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz", - "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.7", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/types": "^7.22.5", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", - "dev": true, - "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - }, - "node_modules/@svgr/babel-plugin-add-jsx-attribute": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz", - "integrity": "sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@svgr/babel-plugin-remove-jsx-attribute": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz", - "integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz", - "integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz", - "integrity": "sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@svgr/babel-plugin-svg-dynamic-title": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz", - "integrity": "sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@svgr/babel-plugin-svg-em-dimensions": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz", - "integrity": "sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@svgr/babel-plugin-transform-react-native-svg": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.0.0.tgz", - "integrity": "sha512-UKrY3860AQICgH7g+6h2zkoxeVEPLYwX/uAjmqo4PIq2FIHppwhIqZstIyTz0ZtlwreKR41O3W3BzsBBiJV2Aw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@svgr/babel-plugin-transform-svg-component": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz", - "integrity": "sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@svgr/babel-preset": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-8.0.0.tgz", - "integrity": "sha512-KLcjiZychInVrhs86OvcYPLTFu9L5XV2vj0XAaE1HwE3J3jLmIzRY8ttdeAg/iFyp8nhavJpafpDZTt+1LIpkQ==", - "dev": true, - "dependencies": { - "@svgr/babel-plugin-add-jsx-attribute": "8.0.0", - "@svgr/babel-plugin-remove-jsx-attribute": "8.0.0", - "@svgr/babel-plugin-remove-jsx-empty-expression": "8.0.0", - "@svgr/babel-plugin-replace-jsx-attribute-value": "8.0.0", - "@svgr/babel-plugin-svg-dynamic-title": "8.0.0", - "@svgr/babel-plugin-svg-em-dimensions": "8.0.0", - "@svgr/babel-plugin-transform-react-native-svg": "8.0.0", - "@svgr/babel-plugin-transform-svg-component": "8.0.0" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@svgr/cli": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@svgr/cli/-/cli-8.0.1.tgz", - "integrity": "sha512-o8CLcozNalKz4c2wFyldaWCQYj5UwXhB2S9ZaR0iZGY2FrU30qzwG1QdtTBTiR6g13udqAPGwDi91Re1QICIKQ==", - "dev": true, - "dependencies": { - "@svgr/core": "8.0.0", - "@svgr/plugin-jsx": "8.0.1", - "@svgr/plugin-prettier": "8.0.1", - "@svgr/plugin-svgo": "8.0.1", - "camelcase": "^6.2.0", - "chalk": "^4.1.2", - "commander": "^9.4.1", - "dashify": "^2.0.0", - "glob": "^8.0.3", - "snake-case": "^3.0.4" - }, - "bin": { - "svgr": "bin/svgr" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - } - }, - "node_modules/@svgr/core": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.0.0.tgz", - "integrity": "sha512-aJKtc+Pie/rFYsVH/unSkDaZGvEeylNv/s2cP+ta9/rYWxRVvoV/S4Qw65Kmrtah4CBK5PM6ISH9qUH7IJQCng==", - "dev": true, - "dependencies": { - "@babel/core": "^7.21.3", - "@svgr/babel-preset": "8.0.0", - "camelcase": "^6.2.0", - "cosmiconfig": "^8.1.3", - "snake-case": "^3.0.4" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - } - }, - "node_modules/@svgr/hast-util-to-babel-ast": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz", - "integrity": "sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==", - "dev": true, - "dependencies": { - "@babel/types": "^7.21.3", - "entities": "^4.4.0" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - } - }, - "node_modules/@svgr/plugin-jsx": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.0.1.tgz", - "integrity": "sha512-bfCFb+4ZsM3UuKP2t7KmDwn6YV8qVn9HIQJmau6xeQb/iV65Rpi7NBNBWA2hcCd4GKoCqG8hpaaDk5FDR0eH+g==", - "dev": true, - "dependencies": { - "@babel/core": "^7.21.3", - "@svgr/babel-preset": "8.0.0", - "@svgr/hast-util-to-babel-ast": "8.0.0", - "svg-parser": "^2.0.4" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@svgr/core": "*" - } - }, - "node_modules/@svgr/plugin-prettier": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@svgr/plugin-prettier/-/plugin-prettier-8.0.1.tgz", - "integrity": "sha512-5ukxApPhNM5JvA91azPGSNp0FtmYXgCiTF8DZtEoM1X4FcPSoN5Pbi930lb226XDO/RtMFy0C8yyFUZ90K8U3A==", - "dev": true, - "dependencies": { - "deepmerge": "^4.3.1", - "prettier": "^2.8.7" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@svgr/core": "*" - } - }, - "node_modules/@svgr/plugin-svgo": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-8.0.1.tgz", - "integrity": "sha512-29OJ1QmJgnohQHDAgAuY2h21xWD6TZiXji+hnx+W635RiXTAlHTbjrZDktfqzkN0bOeQEtNe+xgq73/XeWFfSg==", - "dev": true, - "dependencies": { - "cosmiconfig": "^8.1.3", - "deepmerge": "^4.3.1", - "svgo": "^3.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/gregberge" - }, - "peerDependencies": { - "@svgr/core": "*" - } - }, - "node_modules/@trysound/sax": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", - "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", - "dev": true, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true - }, - "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/browserslist": { - "version": "4.21.9", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz", - "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "caniuse-lite": "^1.0.30001503", - "electron-to-chromium": "^1.4.431", - "node-releases": "^2.0.12", - "update-browserslist-db": "^1.0.11" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001515", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001515.tgz", - "integrity": "sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ] - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/commander": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", - "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", - "dev": true, - "engines": { - "node": "^12.20.0 || >=14" - } - }, - "node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - }, - "node_modules/cosmiconfig": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz", - "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==", - "dev": true, - "dependencies": { - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "parse-json": "^5.0.0", - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/d-fischer" - } - }, - "node_modules/css-select": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", - "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", - "dev": true, - "dependencies": { - "boolbase": "^1.0.0", - "css-what": "^6.1.0", - "domhandler": "^5.0.2", - "domutils": "^3.0.1", - "nth-check": "^2.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/css-tree": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", - "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", - "dev": true, - "dependencies": { - "mdn-data": "2.0.30", - "source-map-js": "^1.0.1" - }, - "engines": { - "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" - } - }, - "node_modules/css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true, - "engines": { - "node": ">= 6" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/csso": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz", - "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==", - "dev": true, - "dependencies": { - "css-tree": "~2.2.0" - }, - "engines": { - "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0", - "npm": ">=7.0.0" - } - }, - "node_modules/csso/node_modules/css-tree": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz", - "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==", - "dev": true, - "dependencies": { - "mdn-data": "2.0.28", - "source-map-js": "^1.0.1" - }, - "engines": { - "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0", - "npm": ">=7.0.0" - } - }, - "node_modules/csso/node_modules/mdn-data": { - "version": "2.0.28", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz", - "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==", - "dev": true - }, - "node_modules/dashify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dashify/-/dashify-2.0.0.tgz", - "integrity": "sha512-hpA5C/YrPjucXypHPPc0oJ1l9Hf6wWbiOL7Ik42cxnsUOhWiCB/fylKbKqqJalW9FgkNQCw16YO8uW9Hs0Iy1A==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/dom-serializer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", - "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", - "dev": true, - "dependencies": { - "domelementtype": "^2.3.0", - "domhandler": "^5.0.2", - "entities": "^4.2.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" - } - }, - "node_modules/domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ] - }, - "node_modules/domhandler": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", - "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", - "dev": true, - "dependencies": { - "domelementtype": "^2.3.0" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } - }, - "node_modules/domutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", - "dev": true, - "dependencies": { - "dom-serializer": "^2.0.0", - "domelementtype": "^2.3.0", - "domhandler": "^5.0.3" - }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" - } - }, - "node_modules/dot-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", - "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", - "dev": true, - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/electron-to-chromium": { - "version": "1.4.457", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.457.tgz", - "integrity": "sha512-/g3UyNDmDd6ebeWapmAoiyy+Sy2HyJ+/X8KyvNeHfKRFfHaA2W8oF5fxD5F3tjBDcjpwo0iek6YNgxNXDBoEtA==", - "dev": true - }, - "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "dev": true, - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "node_modules/lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dev": true, - "dependencies": { - "tslib": "^2.0.3" - } - }, - "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/mdn-data": { - "version": "2.0.30", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", - "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", - "dev": true - }, - "node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dev": true, - "dependencies": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, - "node_modules/node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true - }, - "node_modules/nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "dependencies": { - "boolbase": "^1.0.0" - }, - "funding": { - "url": "https://github.com/fb55/nth-check?sponsor=1" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, - "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/snake-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", - "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", - "dev": true, - "dependencies": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/svg-parser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz", - "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==", - "dev": true - }, - "node_modules/svgo": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz", - "integrity": "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==", - "dev": true, - "dependencies": { - "@trysound/sax": "0.2.0", - "commander": "^7.2.0", - "css-select": "^5.1.0", - "css-tree": "^2.2.1", - "csso": "^5.0.5", - "picocolors": "^1.0.0" - }, - "bin": { - "svgo": "bin/svgo" - }, - "engines": { - "node": ">=14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/svgo" - } - }, - "node_modules/svgo/node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/tslib": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", - "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==", - "dev": true - }, - "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - } - } -} diff --git a/package.json b/package.json deleted file mode 100644 index b80f86e35..000000000 --- a/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "devDependencies": { - "@svgr/cli": "^8.0.1" - } -} diff --git a/poetry.lock b/poetry.lock index 05b5eb850..a9b60719f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,10 +1,9 @@ -# This file is automatically @generated by Poetry and should not be changed by hand. +# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. [[package]] name = "aiofiles" version = "23.2.1" description = "File support for asyncio." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -16,7 +15,6 @@ files = [ name = "aiohttp" version = "3.8.5" description = "Async http client/server framework (asyncio)" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -125,7 +123,6 @@ speedups = ["Brotli", "aiodns", "cchardet"] name = "aiosignal" version = "1.3.1" description = "aiosignal: a list of registered asynchronous callbacks" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -140,7 +137,6 @@ frozenlist = ">=1.1.0" name = "aiostream" version = "0.4.5" description = "Generator-based operators for asynchronous iteration" -category = "main" optional = false python-versions = "*" files = [ @@ -150,21 +146,20 @@ files = [ [[package]] name = "anthropic" -version = "0.3.9" +version = "0.3.10" description = "Client library for the anthropic API" -category = "main" optional = false python-versions = ">=3.7,<4.0" files = [ - {file = "anthropic-0.3.9-py3-none-any.whl", hash = "sha256:23e8daf266c707faa0b85328ada03dcf885e62c2f236eb0159352e29b9c4e2e3"}, - {file = "anthropic-0.3.9.tar.gz", hash = "sha256:c19b75308c07cb1ecbea03ffcdde9ba68e5ca22a22479217712396385678bde3"}, + {file = "anthropic-0.3.10-py3-none-any.whl", hash = "sha256:95cd73168296a4f91a5899a28660991e044322cf94442d07b99901d4ca74acd6"}, + {file = "anthropic-0.3.10.tar.gz", hash = "sha256:d1f66efc541fbff0ecfd37fd4d3690f9daaa748fc42d9ded5863a10815a5d97b"}, ] [package.dependencies] anyio = ">=3.5.0,<4" distro = ">=1.7.0,<2" httpx = ">=0.23.0,<1" -pydantic = ">=1.9.0,<2.0.0" +pydantic = ">=1.9.0,<3" tokenizers = ">=0.13.0" typing-extensions = ">=4.5,<5" @@ -172,7 +167,6 @@ typing-extensions = ">=4.5,<5" name = "anyio" version = "3.7.1" description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -194,7 +188,6 @@ trio = ["trio (<0.22)"] name = "appdirs" version = "1.4.4" description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "main" optional = false python-versions = "*" files = [ @@ -206,7 +199,6 @@ files = [ name = "appnope" version = "0.1.3" description = "Disable App Nap on macOS >= 10.9" -category = "dev" optional = false python-versions = "*" files = [ @@ -218,7 +210,6 @@ files = [ name = "argilla" version = "0.0.1" description = "" -category = "main" optional = false python-versions = "*" files = [ @@ -230,7 +221,6 @@ files = [ name = "asgiref" version = "3.7.2" description = "ASGI specs, helper code, and adapters" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -248,7 +238,6 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] name = "asttokens" version = "2.2.1" description = "Annotate AST trees with source code positions" -category = "dev" optional = false python-versions = "*" files = [ @@ -266,7 +255,6 @@ test = ["astroid", "pytest"] name = "async-timeout" version = "4.0.3" description = "Timeout context manager for asyncio programs" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -278,7 +266,6 @@ files = [ name = "attrs" version = "23.1.0" description = "Classes Without Boilerplate" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -297,7 +284,6 @@ tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pyte name = "authlib" version = "1.2.1" description = "The ultimate Python library in building OAuth and OpenID Connect servers and clients." -category = "main" optional = false python-versions = "*" files = [ @@ -312,7 +298,6 @@ cryptography = ">=3.2" name = "backcall" version = "0.2.0" description = "Specifications for callback functions passed in to an API" -category = "dev" optional = false python-versions = "*" files = [ @@ -324,7 +309,6 @@ files = [ name = "backoff" version = "2.2.1" description = "Function decoration for backoff and retry" -category = "main" optional = false python-versions = ">=3.7,<4.0" files = [ @@ -336,7 +320,6 @@ files = [ name = "beautifulsoup4" version = "4.12.2" description = "Screen-scraping library" -category = "main" optional = false python-versions = ">=3.6.0" files = [ @@ -355,7 +338,6 @@ lxml = ["lxml"] name = "black" version = "23.7.0" description = "The uncompromising code formatter." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -402,7 +384,6 @@ uvloop = ["uvloop (>=0.15.2)"] name = "bleach" version = "6.0.0" description = "An easy safelist-based HTML-sanitizing tool." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -421,7 +402,6 @@ css = ["tinycss2 (>=1.1.0,<1.2)"] name = "cachetools" version = "5.3.1" description = "Extensible memoizing collections and decorators" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -433,7 +413,6 @@ files = [ name = "certifi" version = "2023.7.22" description = "Python package for providing Mozilla's CA Bundle." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -445,7 +424,6 @@ files = [ name = "cffi" version = "1.15.1" description = "Foreign Function Interface for Python calling C code." -category = "main" optional = false python-versions = "*" files = [ @@ -522,7 +500,6 @@ pycparser = "*" name = "chardet" version = "5.2.0" description = "Universal encoding detector for Python 3" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -534,7 +511,6 @@ files = [ name = "charset-normalizer" version = "3.2.0" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" optional = false python-versions = ">=3.7.0" files = [ @@ -619,7 +595,6 @@ files = [ name = "chromadb" version = "0.3.26" description = "Chroma." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -647,14 +622,13 @@ uvicorn = {version = ">=0.18.3", extras = ["standard"]} [[package]] name = "click" -version = "8.1.6" +version = "8.1.7" description = "Composable command line interface toolkit" -category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "click-8.1.6-py3-none-any.whl", hash = "sha256:fa244bb30b3b5ee2cae3da8f55c9e5e0c0e86093306301fb418eb9dc40fbded5"}, - {file = "click-8.1.6.tar.gz", hash = "sha256:48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd"}, + {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, + {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, ] [package.dependencies] @@ -664,7 +638,6 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} name = "click-log" version = "0.4.0" description = "Logging integration for Click" -category = "main" optional = false python-versions = "*" files = [ @@ -679,7 +652,6 @@ click = "*" name = "clickhouse-connect" version = "0.6.8" description = "ClickHouse Database Core Driver for Python, Pandas, and Superset" -category = "main" optional = false python-versions = "~=3.7" files = [ @@ -767,14 +739,13 @@ sqlalchemy = ["sqlalchemy (>1.3.21,<2.0)"] [[package]] name = "cohere" -version = "4.20.1" +version = "4.20.2" description = "" -category = "main" optional = false python-versions = ">=3.7,<4.0" files = [ - {file = "cohere-4.20.1-py3-none-any.whl", hash = "sha256:4466c7abdbb168fe2893e5b5123882fe91691d0e3fe43ee254b411917f780dfc"}, - {file = "cohere-4.20.1.tar.gz", hash = "sha256:533e4a45b38dc338f8a27f24e098b652b4f5ed9f9fbb4719780d1a9fcd1af39e"}, + {file = "cohere-4.20.2-py3-none-any.whl", hash = "sha256:8572ac0da5dbc1ab5d64558ffe59c8735e34b0d46e1a821a9a4a4a12ef18c89e"}, + {file = "cohere-4.20.2.tar.gz", hash = "sha256:ad4e3f7b8752c3eeddca0dc926bf0f55e843560ef9d9ae0f2d0ca077d9faa803"}, ] [package.dependencies] @@ -789,7 +760,6 @@ urllib3 = ">=1.26,<3" name = "colorama" version = "0.4.6" description = "Cross-platform colored terminal text." -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" files = [ @@ -801,7 +771,6 @@ files = [ name = "coloredlogs" version = "15.0.1" description = "Colored terminal output for Python's logging module" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" files = [ @@ -819,7 +788,6 @@ cron = ["capturer (>=2.4)"] name = "comm" version = "0.1.4" description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc." -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -839,7 +807,6 @@ typing = ["mypy (>=0.990)"] name = "coverage" version = "7.3.0" description = "Code coverage measurement for Python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -907,7 +874,6 @@ toml = ["tomli"] name = "cryptography" version = "41.0.3" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -953,7 +919,6 @@ test-randomorder = ["pytest-randomly"] name = "ctransformers" version = "0.2.22" description = "Python bindings for the Transformer models implemented in C/C++ using GGML library." -category = "main" optional = true python-versions = "*" files = [ @@ -974,7 +939,6 @@ tests = ["pytest"] name = "dataclasses-json" version = "0.5.14" description = "Easily serialize dataclasses to and from JSON." -category = "main" optional = false python-versions = ">=3.7,<3.13" files = [ @@ -990,7 +954,6 @@ typing-inspect = ">=0.4.0,<1" name = "debugpy" version = "1.6.7.post1" description = "An implementation of the Debug Adapter Protocol for Python" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1018,7 +981,6 @@ files = [ name = "decorator" version = "5.1.1" description = "Decorators for Humans" -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -1030,7 +992,6 @@ files = [ name = "deprecated" version = "1.2.14" description = "Python @deprecated decorator to deprecate old python classes, functions or methods." -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -1048,7 +1009,6 @@ dev = ["PyTest", "PyTest-Cov", "bump2version (<1)", "sphinx (<2)", "tox"] name = "deprecation" version = "2.1.0" description = "A library to handle automated deprecations" -category = "main" optional = false python-versions = "*" files = [ @@ -1063,7 +1023,6 @@ packaging = "*" name = "dill" version = "0.3.7" description = "serialize all of Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1078,7 +1037,6 @@ graph = ["objgraph (>=1.7.2)"] name = "diskcache" version = "5.6.1" description = "Disk Cache -- Disk and file backed persistent cache." -category = "main" optional = true python-versions = ">=3" files = [ @@ -1090,7 +1048,6 @@ files = [ name = "distro" version = "1.8.0" description = "Distro - an OS platform information API" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -1102,7 +1059,6 @@ files = [ name = "dnspython" version = "2.4.2" description = "DNS toolkit" -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -1122,7 +1078,6 @@ wmi = ["wmi (>=1.5.1,<2.0.0)"] name = "docarray" version = "0.21.1" description = "The data structure for unstructured data" -category = "main" optional = false python-versions = "*" files = [ @@ -1151,7 +1106,6 @@ weaviate = ["weaviate-client (>=3.9.0,<3.10.0)"] name = "docker" version = "6.1.3" description = "A Python library for the Docker Engine API." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1173,7 +1127,6 @@ ssh = ["paramiko (>=2.4.3)"] name = "docstring-parser" version = "0.15" description = "Parse Python docstrings in reST, Google and Numpydoc format" -category = "main" optional = false python-versions = ">=3.6,<4.0" files = [ @@ -1185,7 +1138,6 @@ files = [ name = "docutils" version = "0.20.1" description = "Docutils -- Python Documentation Utilities" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1197,7 +1149,6 @@ files = [ name = "dotty-dict" version = "1.3.1" description = "Dictionary wrapper for quick access to deeply nested keys." -category = "main" optional = false python-versions = ">=3.5,<4.0" files = [ @@ -1209,7 +1160,6 @@ files = [ name = "duckdb" version = "0.8.1" description = "DuckDB embedded database" -category = "main" optional = false python-versions = "*" files = [ @@ -1271,7 +1221,6 @@ files = [ name = "ecdsa" version = "0.18.0" description = "ECDSA cryptographic signature library (pure python)" -category = "main" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" files = [ @@ -1290,7 +1239,6 @@ gmpy2 = ["gmpy2"] name = "et-xmlfile" version = "1.1.0" description = "An implementation of lxml.xmlfile for the standard library" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -1302,7 +1250,6 @@ files = [ name = "exceptiongroup" version = "1.1.3" description = "Backport of PEP 654 (exception groups)" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1317,7 +1264,6 @@ test = ["pytest (>=6)"] name = "executing" version = "1.2.0" description = "Get the currently executing AST node of a frame, and other information" -category = "dev" optional = false python-versions = "*" files = [ @@ -1332,7 +1278,6 @@ tests = ["asttokens", "littleutils", "pytest", "rich"] name = "faiss-cpu" version = "1.7.4" description = "A library for efficient similarity search and clustering of dense vectors." -category = "main" optional = false python-versions = "*" files = [ @@ -1367,7 +1312,6 @@ files = [ name = "fake-useragent" version = "1.2.1" description = "Up-to-date simple useragent faker with real world database" -category = "main" optional = false python-versions = "*" files = [ @@ -1382,7 +1326,6 @@ importlib-resources = {version = ">=5.0", markers = "python_version < \"3.10\""} name = "fastapi" version = "0.100.1" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1402,7 +1345,6 @@ all = ["email-validator (>=2.0.0)", "httpx (>=0.23.0)", "itsdangerous (>=1.1.0)" name = "fastavro" version = "1.8.2" description = "Fast read/write of AVRO files" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -1443,7 +1385,6 @@ zstandard = ["zstandard"] name = "filelock" version = "3.12.2" description = "A platform independent file lock." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1459,7 +1400,6 @@ testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "p name = "filetype" version = "1.2.0" description = "Infer file type and MIME type of any file/buffer. No external dependencies." -category = "main" optional = false python-versions = "*" files = [ @@ -1471,7 +1411,6 @@ files = [ name = "flatbuffers" version = "23.5.26" description = "The FlatBuffers serialization format for Python" -category = "main" optional = false python-versions = "*" files = [ @@ -1483,7 +1422,6 @@ files = [ name = "frozenlist" version = "1.4.0" description = "A list-like structure which implements collections.abc.MutableSequence" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -1554,7 +1492,6 @@ files = [ name = "fsspec" version = "2023.6.0" description = "File-system specification" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -1590,7 +1527,6 @@ tqdm = ["tqdm"] name = "gitdb" version = "4.0.10" description = "Git Object Database" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1605,7 +1541,6 @@ smmap = ">=3.0.1,<6" name = "gitpython" version = "3.1.32" description = "GitPython is a Python library used to interact with Git repositories" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1620,7 +1555,6 @@ gitdb = ">=4.0.1,<5" name = "google-api-core" version = "2.11.1" description = "Google API client core library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1645,7 +1579,6 @@ grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] name = "google-api-python-client" version = "2.97.0" description = "Google API Client Library for Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1654,7 +1587,7 @@ files = [ ] [package.dependencies] -google-api-core = ">=1.31.5,<2.0.0 || >2.3.0,<3.0.0.dev0" +google-api-core = ">=1.31.5,<2.0.dev0 || >2.3.0,<3.0.0.dev0" google-auth = ">=1.19.0,<3.0.0.dev0" google-auth-httplib2 = ">=0.1.0" httplib2 = ">=0.15.0,<1.dev0" @@ -1664,7 +1597,6 @@ uritemplate = ">=3.0.1,<5" name = "google-auth" version = "2.22.0" description = "Google Authentication Library" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -1690,7 +1622,6 @@ requests = ["requests (>=2.20.0,<3.0.0.dev0)"] name = "google-auth-httplib2" version = "0.1.0" description = "Google Authentication Library: httplib2 transport" -category = "main" optional = false python-versions = "*" files = [ @@ -1707,7 +1638,6 @@ six = "*" name = "google-cloud-aiplatform" version = "1.30.1" description = "Vertex AI API client library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1716,7 +1646,7 @@ files = [ ] [package.dependencies] -google-api-core = {version = ">=1.32.0,<2.0.0 || >=2.8.0,<3.0.0dev", extras = ["grpc"]} +google-api-core = {version = ">=1.32.0,<2.0.dev0 || >=2.8.dev0,<3.0.0dev", extras = ["grpc"]} google-cloud-bigquery = ">=1.15.0,<4.0.0dev" google-cloud-resource-manager = ">=1.3.3,<3.0.0dev" google-cloud-storage = ">=1.32.0,<3.0.0dev" @@ -1745,7 +1675,6 @@ xai = ["tensorflow (>=2.3.0,<3.0.0dev)"] name = "google-cloud-bigquery" version = "3.11.4" description = "Google BigQuery API client library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1754,7 +1683,7 @@ files = [ ] [package.dependencies] -google-api-core = {version = ">=1.31.5,<2.0.0 || >2.3.0,<3.0.0dev", extras = ["grpc"]} +google-api-core = {version = ">=1.31.5,<2.0.dev0 || >2.3.0,<3.0.0dev", extras = ["grpc"]} google-cloud-core = ">=1.6.0,<3.0.0dev" google-resumable-media = ">=0.6.0,<3.0dev" grpcio = ">=1.47.0,<2.0dev" @@ -1778,7 +1707,6 @@ tqdm = ["tqdm (>=4.7.4,<5.0.0dev)"] name = "google-cloud-core" version = "2.3.3" description = "Google Cloud API client core library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1787,7 +1715,7 @@ files = [ ] [package.dependencies] -google-api-core = ">=1.31.6,<2.0.0 || >2.3.0,<3.0.0dev" +google-api-core = ">=1.31.6,<2.0.dev0 || >2.3.0,<3.0.0dev" google-auth = ">=1.25.0,<3.0dev" [package.extras] @@ -1797,7 +1725,6 @@ grpc = ["grpcio (>=1.38.0,<2.0dev)"] name = "google-cloud-resource-manager" version = "1.10.3" description = "Google Cloud Resource Manager API client library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1806,7 +1733,7 @@ files = [ ] [package.dependencies] -google-api-core = {version = ">=1.34.0,<2.0.0 || >=2.11.0,<3.0.0dev", extras = ["grpc"]} +google-api-core = {version = ">=1.34.0,<2.0.dev0 || >=2.11.dev0,<3.0.0dev", extras = ["grpc"]} grpc-google-iam-v1 = ">=0.12.4,<1.0.0dev" proto-plus = ">=1.22.0,<2.0.0dev" protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0dev" @@ -1815,7 +1742,6 @@ protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4 name = "google-cloud-storage" version = "2.10.0" description = "Google Cloud Storage API client library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1824,7 +1750,7 @@ files = [ ] [package.dependencies] -google-api-core = ">=1.31.5,<2.0.0 || >2.3.0,<3.0.0dev" +google-api-core = ">=1.31.5,<2.0.dev0 || >2.3.0,<3.0.0dev" google-auth = ">=1.25.0,<3.0dev" google-cloud-core = ">=2.3.0,<3.0dev" google-resumable-media = ">=2.3.2" @@ -1837,7 +1763,6 @@ protobuf = ["protobuf (<5.0.0dev)"] name = "google-crc32c" version = "1.5.0" description = "A python wrapper of the C library 'Google CRC32C'" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1918,7 +1843,6 @@ testing = ["pytest"] name = "google-resumable-media" version = "2.5.0" description = "Utilities for Google Media Downloads and Resumable Uploads" -category = "main" optional = false python-versions = ">= 3.7" files = [ @@ -1937,7 +1861,6 @@ requests = ["requests (>=2.18.0,<3.0.0dev)"] name = "google-search-results" version = "2.4.2" description = "Scrape and search localized results from Google, Bing, Baidu, Yahoo, Yandex, Ebay, Homedepot, youtube at scale using SerpApi.com" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -1951,7 +1874,6 @@ requests = "*" name = "googleapis-common-protos" version = "1.60.0" description = "Common protobufs used in Google APIs" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1970,7 +1892,6 @@ grpc = ["grpcio (>=1.44.0,<2.0.0.dev0)"] name = "gotrue" version = "1.0.2" description = "Python Client Library for GoTrue" -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -1986,7 +1907,6 @@ pydantic = ">=1.10.0,<2.0.0" name = "greenlet" version = "2.0.2" description = "Lightweight in-process concurrent programming" -category = "main" optional = false python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" files = [ @@ -2060,7 +1980,6 @@ test = ["objgraph", "psutil"] name = "grpc-google-iam-v1" version = "0.12.6" description = "IAM API client library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2077,7 +1996,6 @@ protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.1 || >4.21.1,<4 name = "grpcio" version = "1.47.5" description = "HTTP/2-based RPC framework" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -2139,7 +2057,6 @@ protobuf = ["grpcio-tools (>=1.47.5)"] name = "grpcio-health-checking" version = "1.47.5" description = "Standard Health Checking Service for gRPC" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -2155,7 +2072,6 @@ protobuf = ">=3.12.0" name = "grpcio-reflection" version = "1.47.5" description = "Standard Protobuf Reflection Service for gRPC" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -2171,7 +2087,6 @@ protobuf = ">=3.12.0" name = "grpcio-status" version = "1.47.5" description = "Status proto mapping for gRPC" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -2188,7 +2103,6 @@ protobuf = ">=3.12.0" name = "grpcio-tools" version = "1.47.5" description = "Protobuf code generator for gRPC" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -2249,7 +2163,6 @@ setuptools = "*" name = "gunicorn" version = "21.2.0" description = "WSGI HTTP Server for UNIX" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -2270,7 +2183,6 @@ tornado = ["tornado (>=0.2)"] name = "h11" version = "0.14.0" description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2282,7 +2194,6 @@ files = [ name = "h2" version = "4.1.0" description = "HTTP/2 State-Machine based protocol implementation" -category = "main" optional = false python-versions = ">=3.6.1" files = [ @@ -2298,7 +2209,6 @@ hyperframe = ">=6.0,<7" name = "hnswlib" version = "0.7.0" description = "hnswlib" -category = "main" optional = false python-versions = "*" files = [ @@ -2312,7 +2222,6 @@ numpy = "*" name = "hpack" version = "4.0.0" description = "Pure-Python HPACK header compression" -category = "main" optional = false python-versions = ">=3.6.1" files = [ @@ -2324,7 +2233,6 @@ files = [ name = "httpcore" version = "0.16.3" description = "A minimal low-level HTTP client." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2336,17 +2244,16 @@ files = [ anyio = ">=3.0,<5.0" certifi = "*" h11 = ">=0.13,<0.15" -sniffio = ">=1.0.0,<2.0.0" +sniffio = "==1.*" [package.extras] http2 = ["h2 (>=3,<5)"] -socks = ["socksio (>=1.0.0,<2.0.0)"] +socks = ["socksio (==1.*)"] [[package]] name = "httplib2" version = "0.22.0" description = "A comprehensive HTTP client library." -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -2361,7 +2268,6 @@ pyparsing = {version = ">=2.4.2,<3.0.0 || >3.0.0,<3.0.1 || >3.0.1,<3.0.2 || >3.0 name = "httptools" version = "0.6.0" description = "A collection of framework independent HTTP protocol utils." -category = "main" optional = false python-versions = ">=3.5.0" files = [ @@ -2409,7 +2315,6 @@ test = ["Cython (>=0.29.24,<0.30.0)"] name = "httpx" version = "0.23.3" description = "The next generation HTTP client." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2426,15 +2331,14 @@ sniffio = "*" [package.extras] brotli = ["brotli", "brotlicffi"] -cli = ["click (>=8.0.0,<9.0.0)", "pygments (>=2.0.0,<3.0.0)", "rich (>=10,<13)"] +cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<13)"] http2 = ["h2 (>=3,<5)"] -socks = ["socksio (>=1.0.0,<2.0.0)"] +socks = ["socksio (==1.*)"] [[package]] name = "huggingface-hub" version = "0.16.4" description = "Client library to download and publish models, datasets and other repos on the huggingface.co hub" -category = "main" optional = false python-versions = ">=3.7.0" files = [ @@ -2469,7 +2373,6 @@ typing = ["pydantic", "types-PyYAML", "types-requests", "types-simplejson", "typ name = "humanfriendly" version = "10.0" description = "Human friendly output for text interfaces using Python" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" files = [ @@ -2484,7 +2387,6 @@ pyreadline3 = {version = "*", markers = "sys_platform == \"win32\" and python_ve name = "hyperframe" version = "6.0.1" description = "HTTP/2 framing layer for Python" -category = "main" optional = false python-versions = ">=3.6.1" files = [ @@ -2496,7 +2398,6 @@ files = [ name = "idna" version = "3.4" description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -2508,7 +2409,6 @@ files = [ name = "importlib-metadata" version = "6.8.0" description = "Read metadata from Python packages" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2528,7 +2428,6 @@ testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs name = "importlib-resources" version = "6.0.1" description = "Read resources from Python packages" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2547,7 +2446,6 @@ testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", name = "iniconfig" version = "2.0.0" description = "brain-dead simple config-ini parsing" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -2559,7 +2457,6 @@ files = [ name = "invoke" version = "1.7.3" description = "Pythonic task execution" -category = "main" optional = false python-versions = "*" files = [ @@ -2571,7 +2468,6 @@ files = [ name = "ipykernel" version = "6.25.1" description = "IPython Kernel for Jupyter" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2585,7 +2481,7 @@ comm = ">=0.1.1" debugpy = ">=1.6.5" ipython = ">=7.23.1" jupyter-client = ">=6.1.12" -jupyter-core = ">=4.12,<5.0.0 || >=5.1.0" +jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0" matplotlib-inline = ">=0.1" nest-asyncio = "*" packaging = "*" @@ -2605,7 +2501,6 @@ test = ["flaky", "ipyparallel", "pre-commit", "pytest (>=7.0)", "pytest-asyncio" name = "ipython" version = "8.14.0" description = "IPython: Productive Interactive Computing" -category = "dev" optional = false python-versions = ">=3.9" files = [ @@ -2645,7 +2540,6 @@ test-extra = ["curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.21)", "pa name = "jaraco-classes" version = "3.3.0" description = "Utility functions for Python class constructs" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2664,7 +2558,6 @@ testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", name = "jcloud" version = "0.2.16" description = "Simplify deploying and managing Jina projects on Jina Cloud" -category = "main" optional = false python-versions = "*" files = [ @@ -2687,7 +2580,6 @@ test = ["black (==22.3.0)", "jina (>=3.7.0)", "mock", "pytest", "pytest-asyncio" name = "jedi" version = "0.19.0" description = "An autocompletion tool for Python that can be used for text editors." -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -2707,7 +2599,6 @@ testing = ["Django (<3.1)", "attrs", "colorama", "docopt", "pytest (<7.0.0)"] name = "jeepney" version = "0.8.0" description = "Low-level, pure Python DBus protocol wrapper." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2723,7 +2614,6 @@ trio = ["async_generator", "trio"] name = "jina" version = "3.15.2" description = "Build multimodal AI services via cloud native technologies · Neural Search · Generative AI · MLOps" -category = "main" optional = false python-versions = "*" files = [ @@ -2841,7 +2731,6 @@ websockets = ["websockets"] name = "jina-hubble-sdk" version = "0.39.0" description = "SDK for Hubble API at Jina AI." -category = "main" optional = false python-versions = ">=3.7.0" files = [ @@ -2867,7 +2756,6 @@ full = ["aiohttp", "black (==22.3.0)", "docker", "filelock", "flake8 (==4.0.1)", name = "jinja2" version = "3.1.2" description = "A very fast and expressive template engine." -category = "main" optional = true python-versions = ">=3.7" files = [ @@ -2885,7 +2773,6 @@ i18n = ["Babel (>=2.7)"] name = "joblib" version = "1.3.2" description = "Lightweight pipelining with Python functions" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2897,7 +2784,6 @@ files = [ name = "jupyter-client" version = "8.3.0" description = "Jupyter protocol implementation and client libraries" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2907,7 +2793,7 @@ files = [ [package.dependencies] importlib-metadata = {version = ">=4.8.3", markers = "python_version < \"3.10\""} -jupyter-core = ">=4.12,<5.0.0 || >=5.1.0" +jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0" python-dateutil = ">=2.8.2" pyzmq = ">=23.0" tornado = ">=6.2" @@ -2921,7 +2807,6 @@ test = ["coverage", "ipykernel (>=6.14)", "mypy", "paramiko", "pre-commit", "pyt name = "jupyter-core" version = "5.3.1" description = "Jupyter core package. A base package on which Jupyter projects rely." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2942,7 +2827,6 @@ test = ["ipykernel", "pre-commit", "pytest", "pytest-cov", "pytest-timeout"] name = "keyring" version = "24.2.0" description = "Store and access your passwords safely." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2966,7 +2850,6 @@ testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", name = "langchain" version = "0.0.256" description = "Building applications with LLMs through composability" -category = "main" optional = false python-versions = ">=3.8.1,<4.0" files = [ @@ -3006,7 +2889,6 @@ text-helpers = ["chardet (>=5.1.0,<6.0.0)"] name = "langchain-experimental" version = "0.0.8" description = "Building applications with LLMs through composability" -category = "main" optional = false python-versions = ">=3.8.1,<4.0" files = [ @@ -3021,7 +2903,6 @@ langchain = ">=0.0.239" name = "langchain-serve" version = "0.0.60" description = "Langchain Serve - serve your langchain apps on Jina AI Cloud." -category = "main" optional = true python-versions = "*" files = [ @@ -3045,14 +2926,13 @@ test = ["psutil", "pytest", "pytest-asyncio"] [[package]] name = "langsmith" -version = "0.0.22" +version = "0.0.24" description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform." -category = "main" optional = false python-versions = ">=3.8.1,<4.0" files = [ - {file = "langsmith-0.0.22-py3-none-any.whl", hash = "sha256:1bc94a2e5bfa355ca15d9e658c2c2d04c8cc45c61892a1be08a7c3b40f2fd3f4"}, - {file = "langsmith-0.0.22.tar.gz", hash = "sha256:5726c7841294db2a9e5863e20718878d16e28722bdaf3169a278ff3bda2f0be7"}, + {file = "langsmith-0.0.24-py3-none-any.whl", hash = "sha256:f9f951d070aa1919123d700642aca9c781edfc8797a65ab1161aa12f89bed707"}, + {file = "langsmith-0.0.24.tar.gz", hash = "sha256:9c066dd915752324490a735692997b0db0958f5dfc1e0a0dfbf752c6e62c7529"}, ] [package.dependencies] @@ -3063,7 +2943,6 @@ requests = ">=2,<3" name = "linkify-it-py" version = "2.0.2" description = "Links recognition library with FULL unicode support." -category = "main" optional = true python-versions = ">=3.7" files = [ @@ -3082,28 +2961,26 @@ test = ["coverage", "pytest", "pytest-cov"] [[package]] name = "llama-cpp-python" -version = "0.1.68" +version = "0.1.77" description = "A Python wrapper for llama.cpp" -category = "main" optional = true python-versions = ">=3.7" files = [ - {file = "llama_cpp_python-0.1.68.tar.gz", hash = "sha256:619ca317d771fc0c30ceba68c29c318287cd1cae2eaa14661aec675190295f19"}, + {file = "llama_cpp_python-0.1.77.tar.gz", hash = "sha256:76c7fae8f5386edecf38cb149bf119127e1208883f0456c6998465648d6c242e"}, ] [package.dependencies] -diskcache = ">=5.6.1,<6.0.0" -numpy = ">=1.24.4,<2.0.0" -typing-extensions = ">=4.7.1,<5.0.0" +diskcache = ">=5.6.1" +numpy = ">=1.20.0" +typing-extensions = ">=4.5.0" [package.extras] -server = ["fastapi (>=0.99.1,<0.100.0)", "sse-starlette (>=1.6.1,<2.0.0)", "uvicorn (>=0.22.0,<0.23.0)"] +server = ["fastapi (>=0.100.0)", "pydantic-settings (>=2.0.1)", "sse-starlette (>=1.6.1)", "uvicorn (>=0.22.0)"] [[package]] name = "loguru" version = "0.7.0" description = "Python logging made (stupidly) simple" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -3122,7 +2999,6 @@ dev = ["Sphinx (==5.3.0)", "colorama (==0.4.5)", "colorama (==0.4.6)", "freezegu name = "lxml" version = "4.9.3" description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*" files = [ @@ -3133,7 +3009,6 @@ files = [ {file = "lxml-4.9.3-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:cef2502e7e8a96fe5ad686d60b49e1ab03e438bd9123987994528febd569868e"}, {file = "lxml-4.9.3-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:b86164d2cff4d3aaa1f04a14685cbc072efd0b4f99ca5708b2ad1b9b5988a991"}, {file = "lxml-4.9.3-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:42871176e7896d5d45138f6d28751053c711ed4d48d8e30b498da155af39aebd"}, - {file = "lxml-4.9.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ae8b9c6deb1e634ba4f1930eb67ef6e6bf6a44b6eb5ad605642b2d6d5ed9ce3c"}, {file = "lxml-4.9.3-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:411007c0d88188d9f621b11d252cce90c4a2d1a49db6c068e3c16422f306eab8"}, {file = "lxml-4.9.3-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:cd47b4a0d41d2afa3e58e5bf1f62069255aa2fd6ff5ee41604418ca925911d76"}, {file = "lxml-4.9.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0e2cb47860da1f7e9a5256254b74ae331687b9672dfa780eed355c4c9c3dbd23"}, @@ -3142,7 +3017,6 @@ files = [ {file = "lxml-4.9.3-cp310-cp310-win_amd64.whl", hash = "sha256:97047f0d25cd4bcae81f9ec9dc290ca3e15927c192df17331b53bebe0e3ff96d"}, {file = "lxml-4.9.3-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:1f447ea5429b54f9582d4b955f5f1985f278ce5cf169f72eea8afd9502973dd5"}, {file = "lxml-4.9.3-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:57d6ba0ca2b0c462f339640d22882acc711de224d769edf29962b09f77129cbf"}, - {file = "lxml-4.9.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:9767e79108424fb6c3edf8f81e6730666a50feb01a328f4a016464a5893f835a"}, {file = "lxml-4.9.3-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:71c52db65e4b56b8ddc5bb89fb2e66c558ed9d1a74a45ceb7dcb20c191c3df2f"}, {file = "lxml-4.9.3-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d73d8ecf8ecf10a3bd007f2192725a34bd62898e8da27eb9d32a58084f93962b"}, {file = "lxml-4.9.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0a3d3487f07c1d7f150894c238299934a2a074ef590b583103a45002035be120"}, @@ -3162,7 +3036,6 @@ files = [ {file = "lxml-4.9.3-cp36-cp36m-macosx_11_0_x86_64.whl", hash = "sha256:64f479d719dc9f4c813ad9bb6b28f8390360660b73b2e4beb4cb0ae7104f1c12"}, {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:dd708cf4ee4408cf46a48b108fb9427bfa00b9b85812a9262b5c668af2533ea5"}, {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c31c7462abdf8f2ac0577d9f05279727e698f97ecbb02f17939ea99ae8daa98"}, - {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:e3cd95e10c2610c360154afdc2f1480aea394f4a4f1ea0a5eacce49640c9b190"}, {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_28_x86_64.whl", hash = "sha256:4930be26af26ac545c3dffb662521d4e6268352866956672231887d18f0eaab2"}, {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4aec80cde9197340bc353d2768e2a75f5f60bacda2bab72ab1dc499589b3878c"}, {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:14e019fd83b831b2e61baed40cab76222139926b1fb5ed0e79225bc0cae14584"}, @@ -3172,7 +3045,6 @@ files = [ {file = "lxml-4.9.3-cp36-cp36m-win_amd64.whl", hash = "sha256:bef4e656f7d98aaa3486d2627e7d2df1157d7e88e7efd43a65aa5dd4714916cf"}, {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:46f409a2d60f634fe550f7133ed30ad5321ae2e6630f13657fb9479506b00601"}, {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:4c28a9144688aef80d6ea666c809b4b0e50010a2aca784c97f5e6bf143d9f129"}, - {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:141f1d1a9b663c679dc524af3ea1773e618907e96075262726c7612c02b149a4"}, {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:53ace1c1fd5a74ef662f844a0413446c0629d151055340e9893da958a374f70d"}, {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:17a753023436a18e27dd7769e798ce302963c236bc4114ceee5b25c18c52c693"}, {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:7d298a1bd60c067ea75d9f684f5f3992c9d6766fadbc0bcedd39750bf344c2f4"}, @@ -3182,7 +3054,6 @@ files = [ {file = "lxml-4.9.3-cp37-cp37m-win_amd64.whl", hash = "sha256:120fa9349a24c7043854c53cae8cec227e1f79195a7493e09e0c12e29f918e52"}, {file = "lxml-4.9.3-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4d2d1edbca80b510443f51afd8496be95529db04a509bc8faee49c7b0fb6d2cc"}, {file = "lxml-4.9.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:8d7e43bd40f65f7d97ad8ef5c9b1778943d02f04febef12def25f7583d19baac"}, - {file = "lxml-4.9.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:71d66ee82e7417828af6ecd7db817913cb0cf9d4e61aa0ac1fde0583d84358db"}, {file = "lxml-4.9.3-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:6fc3c450eaa0b56f815c7b62f2b7fba7266c4779adcf1cece9e6deb1de7305ce"}, {file = "lxml-4.9.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:65299ea57d82fb91c7f019300d24050c4ddeb7c5a190e076b5f48a2b43d19c42"}, {file = "lxml-4.9.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:eadfbbbfb41b44034a4c757fd5d70baccd43296fb894dba0295606a7cf3124aa"}, @@ -3192,7 +3063,6 @@ files = [ {file = "lxml-4.9.3-cp38-cp38-win_amd64.whl", hash = "sha256:92af161ecbdb2883c4593d5ed4815ea71b31fafd7fd05789b23100d081ecac96"}, {file = "lxml-4.9.3-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:9bb6ad405121241e99a86efff22d3ef469024ce22875a7ae045896ad23ba2340"}, {file = "lxml-4.9.3-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8ed74706b26ad100433da4b9d807eae371efaa266ffc3e9191ea436087a9d6a7"}, - {file = "lxml-4.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:fbf521479bcac1e25a663df882c46a641a9bff6b56dc8b0fafaebd2f66fb231b"}, {file = "lxml-4.9.3-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:303bf1edce6ced16bf67a18a1cf8339d0db79577eec5d9a6d4a80f0fb10aa2da"}, {file = "lxml-4.9.3-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:5515edd2a6d1a5a70bfcdee23b42ec33425e405c5b351478ab7dc9347228f96e"}, {file = "lxml-4.9.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:690dafd0b187ed38583a648076865d8c229661ed20e48f2335d68e2cf7dc829d"}, @@ -3203,16 +3073,13 @@ files = [ {file = "lxml-4.9.3-cp39-cp39-win_amd64.whl", hash = "sha256:4dd9a263e845a72eacb60d12401e37c616438ea2e5442885f65082c276dfb2b2"}, {file = "lxml-4.9.3-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6689a3d7fd13dc687e9102a27e98ef33730ac4fe37795d5036d18b4d527abd35"}, {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f6bdac493b949141b733c5345b6ba8f87a226029cbabc7e9e121a413e49441e0"}, - {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:05186a0f1346ae12553d66df1cfce6f251589fea3ad3da4f3ef4e34b2d58c6a3"}, {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c2006f5c8d28dee289f7020f721354362fa304acbaaf9745751ac4006650254b"}, {file = "lxml-4.9.3-pp38-pypy38_pp73-macosx_11_0_x86_64.whl", hash = "sha256:5c245b783db29c4e4fbbbfc9c5a78be496c9fea25517f90606aa1f6b2b3d5f7b"}, {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4fb960a632a49f2f089d522f70496640fdf1218f1243889da3822e0a9f5f3ba7"}, - {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:50670615eaf97227d5dc60de2dc99fb134a7130d310d783314e7724bf163f75d"}, {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:9719fe17307a9e814580af1f5c6e05ca593b12fb7e44fe62450a5384dbf61b4b"}, {file = "lxml-4.9.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:3331bece23c9ee066e0fb3f96c61322b9e0f54d775fccefff4c38ca488de283a"}, {file = "lxml-4.9.3-pp39-pypy39_pp73-macosx_11_0_x86_64.whl", hash = "sha256:ed667f49b11360951e201453fc3967344d0d0263aa415e1619e85ae7fd17b4e0"}, {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8b77946fd508cbf0fccd8e400a7f71d4ac0e1595812e66025bac475a8e811694"}, - {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:e4da8ca0c0c0aea88fd46be8e44bd49716772358d648cce45fe387f7b92374a7"}, {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:fe4bda6bd4340caa6e5cf95e73f8fea5c4bfc55763dd42f1b50a94c1b4a2fbd4"}, {file = "lxml-4.9.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:f3df3db1d336b9356dd3112eae5f5c2b8b377f3bc826848567f10bfddfee77e9"}, {file = "lxml-4.9.3.tar.gz", hash = "sha256:48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"}, @@ -3228,7 +3095,6 @@ source = ["Cython (>=0.29.35)"] name = "lz4" version = "4.3.2" description = "LZ4 Bindings for Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3278,7 +3144,6 @@ tests = ["psutil", "pytest (!=3.3.0)", "pytest-cov"] name = "markdown" version = "3.4.4" description = "Python implementation of John Gruber's Markdown." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3297,7 +3162,6 @@ testing = ["coverage", "pyyaml"] name = "markdown-it-py" version = "3.0.0" description = "Python port of markdown-it. Markdown parsing, done right!" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -3324,7 +3188,6 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] name = "markupsafe" version = "2.1.3" description = "Safely add untrusted strings to HTML/XML markup." -category = "main" optional = true python-versions = ">=3.7" files = [ @@ -3384,7 +3247,6 @@ files = [ name = "marshmallow" version = "3.20.1" description = "A lightweight library for converting complex datatypes to and from native Python datatypes." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -3405,7 +3267,6 @@ tests = ["pytest", "pytz", "simplejson"] name = "matplotlib-inline" version = "0.1.6" description = "Inline Matplotlib backend for Jupyter" -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -3420,7 +3281,6 @@ traitlets = "*" name = "mdit-py-plugins" version = "0.4.0" description = "Collection of plugins for markdown-it-py" -category = "main" optional = true python-versions = ">=3.8" files = [ @@ -3440,7 +3300,6 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] name = "mdurl" version = "0.1.2" description = "Markdown URL utilities" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3452,7 +3311,6 @@ files = [ name = "metaphor-python" version = "0.1.14" description = "A Python package for the Metaphor API." -category = "main" optional = false python-versions = "*" files = [ @@ -3467,7 +3325,6 @@ requests = "*" name = "monotonic" version = "1.6" description = "An implementation of time.monotonic() for Python 2 & < 3.3" -category = "main" optional = false python-versions = "*" files = [ @@ -3479,7 +3336,6 @@ files = [ name = "more-itertools" version = "10.1.0" description = "More routines for operating on iterables, beyond itertools" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -3491,7 +3347,6 @@ files = [ name = "mpmath" version = "1.3.0" description = "Python library for arbitrary-precision floating-point arithmetic" -category = "main" optional = false python-versions = "*" files = [ @@ -3509,7 +3364,6 @@ tests = ["pytest (>=4.6)"] name = "msg-parser" version = "1.2.0" description = "This module enables reading, parsing and converting Microsoft Outlook MSG E-Mail files." -category = "main" optional = false python-versions = ">=3.4" files = [ @@ -3527,7 +3381,6 @@ rtf = ["compressed-rtf (>=1.0.5)"] name = "multidict" version = "6.0.4" description = "multidict implementation" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3611,7 +3464,6 @@ files = [ name = "multiprocess" version = "0.70.15" description = "better multiprocessing and multithreading in Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3640,7 +3492,6 @@ dill = ">=0.3.7" name = "mypy" version = "1.5.1" description = "Optional static typing for Python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -3687,7 +3538,6 @@ reports = ["lxml"] name = "mypy-extensions" version = "1.0.0" description = "Type system extensions for programs checked with the mypy type checker." -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -3699,7 +3549,6 @@ files = [ name = "nest-asyncio" version = "1.5.7" description = "Patch asyncio to allow nested event loops" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -3711,7 +3560,6 @@ files = [ name = "networkx" version = "3.1" description = "Python package for creating and manipulating graphs and networks" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -3730,7 +3578,6 @@ test = ["codecov (>=2.1)", "pytest (>=7.2)", "pytest-cov (>=4.0)"] name = "nltk" version = "3.8.1" description = "Natural Language Toolkit" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3756,7 +3603,6 @@ twitter = ["twython"] name = "numexpr" version = "2.8.5" description = "Fast numerical expression evaluator for NumPy" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3799,7 +3645,6 @@ numpy = ">=1.13.3" name = "numpy" version = "1.25.2" description = "Fundamental package for array computing in Python" -category = "main" optional = false python-versions = ">=3.9" files = [ @@ -3834,7 +3679,6 @@ files = [ name = "olefile" version = "0.46" description = "Python package to parse, read and write Microsoft OLE2 files (Structured Storage or Compound Document, Microsoft Office)" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -3845,7 +3689,6 @@ files = [ name = "onnxruntime" version = "1.15.1" description = "ONNX Runtime is a runtime accelerator for Machine Learning models" -category = "main" optional = false python-versions = "*" files = [ @@ -3887,7 +3730,6 @@ sympy = "*" name = "openai" version = "0.27.8" description = "Python client library for the OpenAI API" -category = "main" optional = false python-versions = ">=3.7.1" files = [ @@ -3902,7 +3744,7 @@ tqdm = "*" [package.extras] datalib = ["numpy", "openpyxl (>=3.0.7)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"] -dev = ["black (>=21.6b0,<22.0)", "pytest (>=6.0.0,<7.0.0)", "pytest-asyncio", "pytest-mock"] +dev = ["black (>=21.6b0,<22.0)", "pytest (==6.*)", "pytest-asyncio", "pytest-mock"] embeddings = ["matplotlib", "numpy", "openpyxl (>=3.0.7)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)", "plotly", "scikit-learn (>=1.0.2)", "scipy", "tenacity (>=8.0.1)"] wandb = ["numpy", "openpyxl (>=3.0.7)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)", "wandb"] @@ -3910,7 +3752,6 @@ wandb = ["numpy", "openpyxl (>=3.0.7)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1 name = "openapi-schema-pydantic" version = "1.2.4" description = "OpenAPI (v3) specification schema as pydantic class" -category = "main" optional = false python-versions = ">=3.6.1" files = [ @@ -3925,7 +3766,6 @@ pydantic = ">=1.8.2" name = "openpyxl" version = "3.1.2" description = "A Python library to read/write Excel 2010 xlsx/xlsm files" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -3940,7 +3780,6 @@ et-xmlfile = "*" name = "opentelemetry-api" version = "1.19.0" description = "OpenTelemetry Python API" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3956,7 +3795,6 @@ importlib-metadata = ">=6.0,<7.0" name = "opentelemetry-exporter-otlp" version = "1.19.0" description = "OpenTelemetry Collector Exporters" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3972,7 +3810,6 @@ opentelemetry-exporter-otlp-proto-http = "1.19.0" name = "opentelemetry-exporter-otlp-proto-common" version = "1.19.0" description = "OpenTelemetry Protobuf encoding" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3987,7 +3824,6 @@ opentelemetry-proto = "1.19.0" name = "opentelemetry-exporter-otlp-proto-grpc" version = "1.19.0" description = "OpenTelemetry Collector Protobuf over gRPC Exporter" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4012,7 +3848,6 @@ test = ["pytest-grpc"] name = "opentelemetry-exporter-otlp-proto-http" version = "1.19.0" description = "OpenTelemetry Collector Protobuf over HTTP Exporter" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4037,7 +3872,6 @@ test = ["responses (==0.22.0)"] name = "opentelemetry-exporter-prometheus" version = "1.12.0rc1" description = "Prometheus Metric Exporter for OpenTelemetry" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -4054,7 +3888,6 @@ prometheus-client = ">=0.5.0,<1.0.0" name = "opentelemetry-instrumentation" version = "0.40b0" description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4071,7 +3904,6 @@ wrapt = ">=1.0.0,<2.0.0" name = "opentelemetry-instrumentation-aiohttp-client" version = "0.40b0" description = "OpenTelemetry aiohttp client instrumentation" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4094,7 +3926,6 @@ test = ["http-server-mock", "opentelemetry-instrumentation-aiohttp-client[instru name = "opentelemetry-instrumentation-asgi" version = "0.40b0" description = "ASGI instrumentation for OpenTelemetry" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4117,7 +3948,6 @@ test = ["opentelemetry-instrumentation-asgi[instruments]", "opentelemetry-test-u name = "opentelemetry-instrumentation-fastapi" version = "0.40b0" description = "OpenTelemetry FastAPI Instrumentation" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4140,7 +3970,6 @@ test = ["httpx (>=0.22,<1.0)", "opentelemetry-instrumentation-fastapi[instrument name = "opentelemetry-instrumentation-grpc" version = "0.40b0" description = "OpenTelemetry gRPC instrumentation" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4163,7 +3992,6 @@ test = ["opentelemetry-instrumentation-grpc[instruments]", "opentelemetry-sdk (> name = "opentelemetry-proto" version = "1.19.0" description = "OpenTelemetry Python Proto" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4178,7 +4006,6 @@ protobuf = ">=3.19,<5.0" name = "opentelemetry-sdk" version = "1.19.0" description = "OpenTelemetry Python SDK" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4195,7 +4022,6 @@ typing-extensions = ">=3.7.4" name = "opentelemetry-semantic-conventions" version = "0.40b0" description = "OpenTelemetry Semantic Conventions" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4207,7 +4033,6 @@ files = [ name = "opentelemetry-util-http" version = "0.40b0" description = "Web util for OpenTelemetry" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4219,7 +4044,6 @@ files = [ name = "orjson" version = "3.9.3" description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4285,7 +4109,6 @@ files = [ name = "overrides" version = "7.4.0" description = "A decorator to automatically detect mismatch when overriding a method." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -4297,7 +4120,6 @@ files = [ name = "packaging" version = "23.1" description = "Core utilities for Python packages" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4309,7 +4131,6 @@ files = [ name = "pandas" version = "2.0.3" description = "Powerful data structures for data analysis, time series, and statistics" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -4376,7 +4197,6 @@ xml = ["lxml (>=4.6.3)"] name = "pandas-stubs" version = "2.0.3.230814" description = "Type annotations for pandas" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -4392,7 +4212,6 @@ types-pytz = ">=2022.1.1" name = "parso" version = "0.8.3" description = "A Python Parser" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -4408,7 +4227,6 @@ testing = ["docopt", "pytest (<6.0.0)"] name = "pathspec" version = "0.11.2" description = "Utility library for gitignore style pattern matching of file paths." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4420,7 +4238,6 @@ files = [ name = "pdf2image" version = "1.16.3" description = "A wrapper around the pdftoppm and pdftocairo command line tools to convert PDF to a PIL Image list." -category = "main" optional = false python-versions = "*" files = [ @@ -4435,7 +4252,6 @@ pillow = "*" name = "pdfminer-six" version = "20221105" description = "PDF parser and analyzer" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -4456,7 +4272,6 @@ image = ["Pillow"] name = "pexpect" version = "4.8.0" description = "Pexpect allows easy control of interactive console applications." -category = "dev" optional = false python-versions = "*" files = [ @@ -4471,7 +4286,6 @@ ptyprocess = ">=0.5" name = "pickleshare" version = "0.7.5" description = "Tiny 'shelve'-like database with concurrency support" -category = "dev" optional = false python-versions = "*" files = [ @@ -4483,7 +4297,6 @@ files = [ name = "pillow" version = "10.0.0" description = "Python Imaging Library (Fork)" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -4551,7 +4364,6 @@ tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "pa name = "pinecone-client" version = "2.2.2" description = "Pinecone client and SDK" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -4577,7 +4389,6 @@ grpc = ["googleapis-common-protos (>=1.53.0)", "grpc-gateway-protoc-gen-openapiv name = "pkginfo" version = "1.9.6" description = "Query metadata from sdists / bdists / installed packages." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -4592,7 +4403,6 @@ testing = ["pytest", "pytest-cov"] name = "platformdirs" version = "3.10.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -4608,7 +4418,6 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-co name = "pluggy" version = "1.2.0" description = "plugin and hook calling mechanisms for python" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -4624,7 +4433,6 @@ testing = ["pytest", "pytest-benchmark"] name = "portalocker" version = "2.7.0" description = "Wraps the portalocker recipe for easy usage" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -4644,7 +4452,6 @@ tests = ["pytest (>=5.4.1)", "pytest-cov (>=2.8.1)", "pytest-mypy (>=0.8.0)", "p name = "postgrest" version = "0.10.6" description = "PostgREST client for Python. This library provides an ORM interface to PostgREST." -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -4660,14 +4467,13 @@ strenum = ">=0.4.9,<0.5.0" [[package]] name = "posthog" -version = "3.0.1" +version = "3.0.2" description = "Integrate PostHog into any python application." -category = "main" optional = false python-versions = "*" files = [ - {file = "posthog-3.0.1-py2.py3-none-any.whl", hash = "sha256:9c7f92fecc713257d4b2710d05b456569c9156fbdd3e85655ba7ba5ba6c7b3ae"}, - {file = "posthog-3.0.1.tar.gz", hash = "sha256:57d2791ff5752ce56ba0f9bb8876faf3ca9208f1c2c6ceaeb5a2504c34493767"}, + {file = "posthog-3.0.2-py2.py3-none-any.whl", hash = "sha256:a8c0af6f2401fbe50f90e68c4143d0824b54e872de036b1c2f23b5abb39d88ce"}, + {file = "posthog-3.0.2.tar.gz", hash = "sha256:701fba6e446a4de687c6e861b587e7b7741955ad624bf34fe013c06a0fec6fb3"}, ] [package.dependencies] @@ -4686,7 +4492,6 @@ test = ["coverage", "flake8", "freezegun (==0.3.15)", "mock (>=2.0.0)", "pylint" name = "prometheus-client" version = "0.17.1" description = "Python client for the Prometheus monitoring system." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -4701,7 +4506,6 @@ twisted = ["twisted"] name = "prompt-toolkit" version = "3.0.39" description = "Library for building powerful interactive command lines in Python" -category = "dev" optional = false python-versions = ">=3.7.0" files = [ @@ -4716,7 +4520,6 @@ wcwidth = "*" name = "proto-plus" version = "1.22.3" description = "Beautiful, Pythonic protocol buffers." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -4734,7 +4537,6 @@ testing = ["google-api-core[grpc] (>=1.31.5)"] name = "protobuf" version = "3.20.3" description = "Protocol Buffers" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4766,7 +4568,6 @@ files = [ name = "psutil" version = "5.9.5" description = "Cross-platform lib for process and system monitoring in Python." -category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -4793,7 +4594,6 @@ test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"] name = "psycopg" version = "3.1.10" description = "PostgreSQL database adapter for Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4817,7 +4617,6 @@ test = ["anyio (>=3.6.2)", "mypy (>=1.4.1)", "pproxy (>=2.7)", "pytest (>=6.2.5) name = "psycopg-binary" version = "3.1.10" description = "PostgreSQL database adapter for Python -- C optimisation distribution" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -4881,7 +4680,6 @@ files = [ name = "psycopg2-binary" version = "2.9.7" description = "psycopg2 - Python-PostgreSQL Database Adapter" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -4951,7 +4749,6 @@ files = [ name = "ptyprocess" version = "0.7.0" description = "Run a subprocess in a pseudo terminal" -category = "dev" optional = false python-versions = "*" files = [ @@ -4963,7 +4760,6 @@ files = [ name = "pulsar-client" version = "3.2.0" description = "Apache Pulsar Python client library" -category = "main" optional = false python-versions = "*" files = [ @@ -5011,7 +4807,6 @@ functions = ["apache-bookkeeper-client (>=4.16.1)", "grpcio (>=1.8.2)", "prometh name = "pure-eval" version = "0.2.2" description = "Safely evaluate AST nodes without side effects" -category = "dev" optional = false python-versions = "*" files = [ @@ -5026,7 +4821,6 @@ tests = ["pytest"] name = "py-cpuinfo" version = "9.0.0" description = "Get CPU info with pure Python" -category = "main" optional = true python-versions = "*" files = [ @@ -5038,7 +4832,6 @@ files = [ name = "pyarrow" version = "12.0.1" description = "Python library for Apache Arrow" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -5076,7 +4869,6 @@ numpy = ">=1.16.6" name = "pyasn1" version = "0.5.0" description = "Pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208)" -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" files = [ @@ -5088,7 +4880,6 @@ files = [ name = "pyasn1-modules" version = "0.3.0" description = "A collection of ASN.1-based protocols modules" -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" files = [ @@ -5103,7 +4894,6 @@ pyasn1 = ">=0.4.6,<0.6.0" name = "pycparser" version = "2.21" description = "C parser in Python" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -5115,7 +4905,6 @@ files = [ name = "pydantic" version = "1.10.12" description = "Data validation and settings management using python type hints" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -5168,7 +4957,6 @@ email = ["email-validator (>=1.0.3)"] name = "pygments" version = "2.16.1" description = "Pygments is a syntax highlighting package written in Python." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -5183,7 +4971,6 @@ plugins = ["importlib-metadata"] name = "pymongo" version = "4.4.1" description = "Python driver for MongoDB " -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -5278,7 +5065,6 @@ zstd = ["zstandard"] name = "pypandoc" version = "1.11" description = "Thin wrapper for pandoc." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -5290,7 +5076,6 @@ files = [ name = "pyparsing" version = "3.1.1" description = "pyparsing module - Classes and methods to define and execute parsing grammars" -category = "main" optional = false python-versions = ">=3.6.8" files = [ @@ -5305,7 +5090,6 @@ diagrams = ["jinja2", "railroad-diagrams"] name = "pypdf" version = "3.15.1" description = "A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -5327,7 +5111,6 @@ image = ["Pillow (>=8.0.0)"] name = "pyreadline3" version = "3.4.1" description = "A python implementation of GNU readline." -category = "main" optional = false python-versions = "*" files = [ @@ -5339,7 +5122,6 @@ files = [ name = "pysrt" version = "1.1.2" description = "SubRip (.srt) subtitle parser and writer" -category = "main" optional = false python-versions = "*" files = [ @@ -5353,7 +5135,6 @@ chardet = "*" name = "pytest" version = "7.4.0" description = "pytest: simple powerful testing with Python" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -5376,7 +5157,6 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no name = "pytest-cov" version = "4.1.0" description = "Pytest plugin for measuring coverage." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -5395,7 +5175,6 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale name = "python-dateutil" version = "2.8.2" description = "Extensions to the standard Python datetime module" -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" files = [ @@ -5410,7 +5189,6 @@ six = ">=1.5" name = "python-docx" version = "0.8.11" description = "Create and update Microsoft Word .docx files." -category = "main" optional = false python-versions = "*" files = [ @@ -5424,7 +5202,6 @@ lxml = ">=2.3.2" name = "python-dotenv" version = "1.0.0" description = "Read key-value pairs from a .env file and set them as environment variables" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -5439,7 +5216,6 @@ cli = ["click (>=5.0)"] name = "python-gitlab" version = "3.15.0" description = "Interact with GitLab API" -category = "main" optional = false python-versions = ">=3.7.0" files = [ @@ -5459,7 +5235,6 @@ yaml = ["PyYaml (>=5.2)"] name = "python-jose" version = "3.3.0" description = "JOSE implementation in Python" -category = "main" optional = false python-versions = "*" files = [ @@ -5481,7 +5256,6 @@ pycryptodome = ["pyasn1", "pycryptodome (>=3.3.1,<4.0.0)"] name = "python-magic" version = "0.4.27" description = "File type identification using libmagic" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" files = [ @@ -5493,7 +5267,6 @@ files = [ name = "python-multipart" version = "0.0.6" description = "A streaming multipart parser for Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -5508,7 +5281,6 @@ dev = ["atomicwrites (==1.2.1)", "attrs (==19.2.0)", "coverage (==6.5.0)", "hatc name = "python-pptx" version = "0.6.21" description = "Generate and manipulate Open XML PowerPoint (.pptx) files" -category = "main" optional = false python-versions = "*" files = [ @@ -5524,7 +5296,6 @@ XlsxWriter = ">=0.5.7" name = "python-semantic-release" version = "7.33.2" description = "Automatic Semantic Versioning for Python projects" -category = "main" optional = false python-versions = "*" files = [ @@ -5556,7 +5327,6 @@ test = ["coverage (>=5,<6)", "mock (==1.3.0)", "pytest (>=7,<8)", "pytest-mock ( name = "pytz" version = "2023.3" description = "World timezone definitions, modern and historical" -category = "main" optional = false python-versions = "*" files = [ @@ -5568,7 +5338,6 @@ files = [ name = "pywin32" version = "306" description = "Python for Window Extensions" -category = "main" optional = false python-versions = "*" files = [ @@ -5592,7 +5361,6 @@ files = [ name = "pywin32-ctypes" version = "0.2.2" description = "A (partial) reimplementation of pywin32 using ctypes/cffi" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -5604,7 +5372,6 @@ files = [ name = "pyyaml" version = "6.0.1" description = "YAML parser and emitter for Python" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -5654,7 +5421,6 @@ files = [ name = "pyzmq" version = "25.1.1" description = "Python bindings for 0MQ" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -5760,7 +5526,6 @@ cffi = {version = "*", markers = "implementation_name == \"pypy\""} name = "qdrant-client" version = "1.4.0" description = "Client library for the Qdrant vector search engine" -category = "main" optional = false python-versions = ">=3.7,<3.12" files = [ @@ -5781,7 +5546,6 @@ urllib3 = ">=1.26.14,<2.0.0" name = "readme-renderer" version = "40.0" description = "readme_renderer is a library for rendering \"readme\" descriptions for Warehouse" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -5801,7 +5565,6 @@ md = ["cmarkgfm (>=0.8.0)"] name = "realtime" version = "1.0.0" description = "" -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -5818,7 +5581,6 @@ websockets = ">=10.3,<11.0" name = "regex" version = "2023.8.8" description = "Alternative regular expression module, to replace re." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -5916,7 +5678,6 @@ files = [ name = "requests" version = "2.31.0" description = "Python HTTP for Humans." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -5938,7 +5699,6 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] name = "requests-toolbelt" version = "1.0.0" description = "A utility belt for advanced users of python-requests" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -5953,7 +5713,6 @@ requests = ">=2.0.1,<3.0.0" name = "rfc3986" version = "1.5.0" description = "Validating URI References per RFC 3986" -category = "main" optional = false python-versions = "*" files = [ @@ -5971,7 +5730,6 @@ idna2008 = ["idna"] name = "rich" version = "13.5.2" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" -category = "main" optional = false python-versions = ">=3.7.0" files = [ @@ -5990,7 +5748,6 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"] name = "rsa" version = "4.9" description = "Pure-Python RSA implementation" -category = "main" optional = false python-versions = ">=3.6,<4" files = [ @@ -6005,7 +5762,6 @@ pyasn1 = ">=0.1.3" name = "ruff" version = "0.0.254" description = "An extremely fast Python linter, written in Rust." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -6032,48 +5788,34 @@ files = [ name = "safetensors" version = "0.3.2" description = "Fast and Safe Tensor serialization" -category = "main" optional = true python-versions = "*" files = [ {file = "safetensors-0.3.2-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:b6a66989075c2891d743153e8ba9ca84ee7232c8539704488f454199b8b8f84d"}, {file = "safetensors-0.3.2-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:670d6bc3a3b377278ce2971fa7c36ebc0a35041c4ea23b9df750a39380800195"}, - {file = "safetensors-0.3.2-cp310-cp310-macosx_13_0_arm64.whl", hash = "sha256:564f42838721925b5313ae864ba6caa6f4c80a9fbe63cf24310c3be98ab013cd"}, {file = "safetensors-0.3.2-cp310-cp310-macosx_13_0_x86_64.whl", hash = "sha256:7f80af7e4ab3188daaff12d43d078da3017a90d732d38d7af4eb08b6ca2198a5"}, - {file = "safetensors-0.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ec30d78f20f1235b252d59cbb9755beb35a1fde8c24c89b3c98e6a1804cfd432"}, - {file = "safetensors-0.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:16063d94d8f600768d3c331b1e97964b1bf3772e19710105fe24ec5a6af63770"}, {file = "safetensors-0.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cbb44e140bf2aeda98d9dde669dbec15f7b77f96a9274469b91a6cf4bcc5ec3b"}, {file = "safetensors-0.3.2-cp310-cp310-win32.whl", hash = "sha256:2961c1243fd0da46aa6a1c835305cc4595486f8ac64632a604d0eb5f2de76175"}, {file = "safetensors-0.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:c813920482c337d1424d306e1b05824a38e3ef94303748a0a287dea7a8c4f805"}, {file = "safetensors-0.3.2-cp311-cp311-macosx_10_11_universal2.whl", hash = "sha256:707df34bd9b9047e97332136ad98e57028faeccdb9cfe1c3b52aba5964cc24bf"}, {file = "safetensors-0.3.2-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:becc5bb85b2947eae20ed23b407ebfd5277d9a560f90381fe2c42e6c043677ba"}, - {file = "safetensors-0.3.2-cp311-cp311-macosx_13_0_arm64.whl", hash = "sha256:30a75707be5cc9686490bde14b9a371cede4af53244ea72b340cfbabfffdf58a"}, {file = "safetensors-0.3.2-cp311-cp311-macosx_13_0_universal2.whl", hash = "sha256:54ad6af663e15e2b99e2ea3280981b7514485df72ba6d014dc22dae7ba6a5e6c"}, - {file = "safetensors-0.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37764b3197656ef507a266c453e909a3477dabc795962b38e3ad28226f53153b"}, - {file = "safetensors-0.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4939067736783acd8391d83cd97d6c202f94181951ce697d519f9746381b6a39"}, {file = "safetensors-0.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ada0fac127ff8fb04834da5c6d85a8077e6a1c9180a11251d96f8068db922a17"}, {file = "safetensors-0.3.2-cp311-cp311-win32.whl", hash = "sha256:155b82dbe2b0ebff18cde3f76b42b6d9470296e92561ef1a282004d449fa2b4c"}, {file = "safetensors-0.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:a86428d196959619ce90197731be9391b5098b35100a7228ef4643957648f7f5"}, {file = "safetensors-0.3.2-cp37-cp37m-macosx_11_0_x86_64.whl", hash = "sha256:c1f8ab41ed735c5b581f451fd15d9602ff51aa88044bfa933c5fa4b1d0c644d1"}, {file = "safetensors-0.3.2-cp37-cp37m-macosx_13_0_x86_64.whl", hash = "sha256:bc9cfb3c9ea2aec89685b4d656f9f2296f0f0d67ecf2bebf950870e3be89b3db"}, - {file = "safetensors-0.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ace5d471e3d78e0d93f952707d808b5ab5eac77ddb034ceb702e602e9acf2be9"}, - {file = "safetensors-0.3.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:de3e20a388b444381bcda1a3193cce51825ddca277e4cf3ed1fe8d9b2d5722cd"}, {file = "safetensors-0.3.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d7d70d48585fe8df00725aa788f2e64fd24a4c9ae07cd6be34f6859d0f89a9c"}, {file = "safetensors-0.3.2-cp37-cp37m-win32.whl", hash = "sha256:6ff59bc90cdc857f68b1023be9085fda6202bbe7f2fd67d06af8f976d6adcc10"}, {file = "safetensors-0.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:8b05c93da15fa911763a89281906ca333ed800ab0ef1c7ce53317aa1a2322f19"}, {file = "safetensors-0.3.2-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:8969cfd9e8d904e8d3c67c989e1bd9a95e3cc8980d4f95e4dcd43c299bb94253"}, {file = "safetensors-0.3.2-cp38-cp38-macosx_13_0_x86_64.whl", hash = "sha256:f54148ac027556eb02187e9bc1556c4d916c99ca3cb34ca36a7d304d675035c1"}, - {file = "safetensors-0.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:caec25fedbcf73f66c9261984f07885680f71417fc173f52279276c7f8a5edd3"}, - {file = "safetensors-0.3.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:50224a1d99927ccf3b75e27c3d412f7043280431ab100b4f08aad470c37cf99a"}, {file = "safetensors-0.3.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa98f49e95f02eb750d32c4947e7d5aa43883149ebd0414920866446525b70f0"}, {file = "safetensors-0.3.2-cp38-cp38-win32.whl", hash = "sha256:33409df5e28a83dc5cc5547a3ac17c0f1b13a1847b1eb3bc4b3be0df9915171e"}, {file = "safetensors-0.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:e04a7cbbb3856159ab99e3adb14521544f65fcb8548cce773a1435a0f8d78d27"}, {file = "safetensors-0.3.2-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:7c864cf5dcbfb608c5378f83319c60cc9c97263343b57c02756b7613cd5ab4dd"}, {file = "safetensors-0.3.2-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:14e8c19d6dc51d4f70ee33c46aff04c8ba3f95812e74daf8036c24bc86e75cae"}, - {file = "safetensors-0.3.2-cp39-cp39-macosx_13_0_arm64.whl", hash = "sha256:042a60f633c3c7009fdf6a7c182b165cb7283649d2a1e9c7a4a1c23454bd9a5b"}, {file = "safetensors-0.3.2-cp39-cp39-macosx_13_0_x86_64.whl", hash = "sha256:fafd95e5ef41e8f312e2a32b7031f7b9b2a621b255f867b221f94bb2e9f51ae8"}, - {file = "safetensors-0.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8ed77cf358abce2307f03634694e0b2a29822e322a1623e0b1aa4b41e871bf8b"}, - {file = "safetensors-0.3.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5d344e8b2681a33aafc197c90b0def3229b3317d749531c72fa6259d0caa5c8c"}, {file = "safetensors-0.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87ff0024ef2e5722a79af24688ce4a430f70601d0cf712a744105ed4b8f67ba5"}, {file = "safetensors-0.3.2-cp39-cp39-win32.whl", hash = "sha256:827af9478b78977248ba93e2fd97ea307fb63f463f80cef4824460f8c2542a52"}, {file = "safetensors-0.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:9b09f27c456efa301f98681ea14b12f81f2637889f6336223ccab71e42c34541"}, @@ -6096,7 +5838,6 @@ torch = ["torch (>=1.10)"] name = "scikit-learn" version = "1.3.0" description = "A set of python modules for machine learning and data mining" -category = "main" optional = true python-versions = ">=3.8" files = [ @@ -6137,31 +5878,36 @@ tests = ["black (>=23.3.0)", "matplotlib (>=3.1.3)", "mypy (>=1.3)", "numpydoc ( [[package]] name = "scipy" -version = "1.11.1" +version = "1.11.2" description = "Fundamental algorithms for scientific computing in Python" -category = "main" optional = true python-versions = "<3.13,>=3.9" files = [ - {file = "scipy-1.11.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:aec8c62fbe52914f9cf28d846cf0401dd80ab80788bbab909434eb336ed07c04"}, - {file = "scipy-1.11.1-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:3b9963798df1d8a52db41a6fc0e6fa65b1c60e85d73da27ae8bb754de4792481"}, - {file = "scipy-1.11.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e8eb42db36526b130dfbc417609498a6192381abc1975b91e3eb238e0b41c1a"}, - {file = "scipy-1.11.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:366a6a937110d80dca4f63b3f5b00cc89d36f678b2d124a01067b154e692bab1"}, - {file = "scipy-1.11.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:08d957ca82d3535b3b9ba6c8ff355d78fe975271874e2af267cb5add5bd78625"}, - {file = "scipy-1.11.1-cp310-cp310-win_amd64.whl", hash = "sha256:e866514bc2d660608447b6ba95c8900d591f2865c07cca0aa4f7ff3c4ca70f30"}, - {file = "scipy-1.11.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ba94eeef3c9caa4cea7b402a35bb02a5714ee1ee77eb98aca1eed4543beb0f4c"}, - {file = "scipy-1.11.1-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:512fdc18c65f76dadaca139348e525646d440220d8d05f6d21965b8d4466bccd"}, - {file = "scipy-1.11.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cce154372f0ebe88556ed06d7b196e9c2e0c13080ecb58d0f35062dc7cc28b47"}, - {file = "scipy-1.11.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b4bb943010203465ac81efa392e4645265077b4d9e99b66cf3ed33ae12254173"}, - {file = "scipy-1.11.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:249cfa465c379c9bb2c20123001e151ff5e29b351cbb7f9c91587260602c58d0"}, - {file = "scipy-1.11.1-cp311-cp311-win_amd64.whl", hash = "sha256:ffb28e3fa31b9c376d0fb1f74c1f13911c8c154a760312fbee87a21eb21efe31"}, - {file = "scipy-1.11.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:39154437654260a52871dfde852adf1b93b1d1bc5dc0ffa70068f16ec0be2624"}, - {file = "scipy-1.11.1-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:b588311875c58d1acd4ef17c983b9f1ab5391755a47c3d70b6bd503a45bfaf71"}, - {file = "scipy-1.11.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d51565560565a0307ed06fa0ec4c6f21ff094947d4844d6068ed04400c72d0c3"}, - {file = "scipy-1.11.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b41a0f322b4eb51b078cb3441e950ad661ede490c3aca66edef66f4b37ab1877"}, - {file = "scipy-1.11.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:396fae3f8c12ad14c5f3eb40499fd06a6fef8393a6baa352a652ecd51e74e029"}, - {file = "scipy-1.11.1-cp39-cp39-win_amd64.whl", hash = "sha256:be8c962a821957fdde8c4044efdab7a140c13294997a407eaee777acf63cbf0c"}, - {file = "scipy-1.11.1.tar.gz", hash = "sha256:fb5b492fa035334fd249f0973cc79ecad8b09c604b42a127a677b45a9a3d4289"}, + {file = "scipy-1.11.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2b997a5369e2d30c97995dcb29d638701f8000d04df01b8e947f206e5d0ac788"}, + {file = "scipy-1.11.2-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:95763fbda1206bec41157582bea482f50eb3702c85fffcf6d24394b071c0e87a"}, + {file = "scipy-1.11.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e367904a0fec76433bf3fbf3e85bf60dae8e9e585ffd21898ab1085a29a04d16"}, + {file = "scipy-1.11.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d690e1ca993c8f7ede6d22e5637541217fc6a4d3f78b3672a6fe454dbb7eb9a7"}, + {file = "scipy-1.11.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d2b813bfbe8dec6a75164523de650bad41f4405d35b0fa24c2c28ae07fcefb20"}, + {file = "scipy-1.11.2-cp310-cp310-win_amd64.whl", hash = "sha256:afdb0d983f6135d50770dd979df50bf1c7f58b5b33e0eb8cf5c73c70600eae1d"}, + {file = "scipy-1.11.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8d9886f44ef8c9e776cb7527fb01455bf4f4a46c455c4682edc2c2cc8cd78562"}, + {file = "scipy-1.11.2-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:1342ca385c673208f32472830c10110a9dcd053cf0c4b7d4cd7026d0335a6c1d"}, + {file = "scipy-1.11.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b133f237bd8ba73bad51bc12eb4f2d84cbec999753bf25ba58235e9fc2096d80"}, + {file = "scipy-1.11.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3aeb87661de987f8ec56fa6950863994cd427209158255a389fc5aea51fa7055"}, + {file = "scipy-1.11.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:90d3b1364e751d8214e325c371f0ee0dd38419268bf4888b2ae1040a6b266b2a"}, + {file = "scipy-1.11.2-cp311-cp311-win_amd64.whl", hash = "sha256:f73102f769ee06041a3aa26b5841359b1a93cc364ce45609657751795e8f4a4a"}, + {file = "scipy-1.11.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fa4909c6c20c3d91480533cddbc0e7c6d849e7d9ded692918c76ce5964997898"}, + {file = "scipy-1.11.2-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:ac74b1512d38718fb6a491c439aa7b3605b96b1ed3be6599c17d49d6c60fca18"}, + {file = "scipy-1.11.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b8425fa963a32936c9773ee3ce44a765d8ff67eed5f4ac81dc1e4a819a238ee9"}, + {file = "scipy-1.11.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:542a757e2a6ec409e71df3d8fd20127afbbacb1c07990cb23c5870c13953d899"}, + {file = "scipy-1.11.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:ea932570b1c2a30edafca922345854ff2cd20d43cd9123b6dacfdecebfc1a80b"}, + {file = "scipy-1.11.2-cp312-cp312-win_amd64.whl", hash = "sha256:4447ad057d7597476f9862ecbd9285bbf13ba9d73ce25acfa4e4b11c6801b4c9"}, + {file = "scipy-1.11.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b0620240ef445b5ddde52460e6bc3483b7c9c750275369379e5f609a1050911c"}, + {file = "scipy-1.11.2-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:f28f1f6cfeb48339c192efc6275749b2a25a7e49c4d8369a28b6591da02fbc9a"}, + {file = "scipy-1.11.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:214cdf04bbae7a54784f8431f976704ed607c4bc69ba0d5d5d6a9df84374df76"}, + {file = "scipy-1.11.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10eb6af2f751aa3424762948e5352f707b0dece77288206f227864ddf675aca0"}, + {file = "scipy-1.11.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0f3261f14b767b316d7137c66cc4f33a80ea05841b9c87ad83a726205b901423"}, + {file = "scipy-1.11.2-cp39-cp39-win_amd64.whl", hash = "sha256:2c91cf049ffb5575917f2a01da1da082fd24ed48120d08a6e7297dfcac771dcd"}, + {file = "scipy-1.11.2.tar.gz", hash = "sha256:b29318a5e39bd200ca4381d80b065cdf3076c7d7281c5e36569e99273867f61d"}, ] [package.dependencies] @@ -6176,7 +5922,6 @@ test = ["asv", "gmpy2", "mpmath", "pooch", "pytest", "pytest-cov", "pytest-timeo name = "secretstorage" version = "3.3.3" description = "Python bindings to FreeDesktop.org Secret Service API" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -6192,7 +5937,6 @@ jeepney = ">=0.6" name = "semver" version = "2.13.0" description = "Python helper for Semantic Versioning (http://semver.org/)" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -6204,7 +5948,6 @@ files = [ name = "sentence-transformers" version = "2.2.2" description = "Multilingual text embeddings" -category = "main" optional = true python-versions = ">=3.6.0" files = [ @@ -6227,7 +5970,6 @@ transformers = ">=4.6.0,<5.0.0" name = "sentencepiece" version = "0.1.99" description = "SentencePiece python wrapper" -category = "main" optional = true python-versions = "*" files = [ @@ -6282,7 +6024,6 @@ files = [ name = "setuptools" version = "68.1.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -6299,7 +6040,6 @@ testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs ( name = "shapely" version = "1.8.5.post1" description = "Geometric objects, predicates, and operations" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -6356,7 +6096,6 @@ vectorized = ["numpy"] name = "six" version = "1.16.0" description = "Python 2 and 3 compatibility utilities" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" files = [ @@ -6368,7 +6107,6 @@ files = [ name = "slack-bolt" version = "1.18.0" description = "The Bolt Framework for Python" -category = "main" optional = true python-versions = ">=3.6" files = [ @@ -6390,7 +6128,6 @@ testing-without-asyncio = ["Flask-Sockets (>=0.2,<1)", "Jinja2 (==3.0.3)", "Werk name = "slack-sdk" version = "3.21.3" description = "The Slack API Platform SDK for Python" -category = "main" optional = true python-versions = ">=3.6.0" files = [ @@ -6406,7 +6143,6 @@ testing = ["Flask (>=1,<2)", "Flask-Sockets (>=0.2,<1)", "Jinja2 (==3.0.3)", "We name = "smmap" version = "5.0.0" description = "A pure Python implementation of a sliding window memory map manager" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -6418,7 +6154,6 @@ files = [ name = "sniffio" version = "1.3.0" description = "Sniff out which async library your code is running under" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -6430,7 +6165,6 @@ files = [ name = "soupsieve" version = "2.4.1" description = "A modern CSS selector implementation for Beautiful Soup." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -6442,7 +6176,6 @@ files = [ name = "sqlalchemy" version = "1.4.41" description = "Database Abstraction Library" -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" files = [ @@ -6490,7 +6223,7 @@ files = [ ] [package.dependencies] -greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platform_machine == \"aarch64\" or platform_machine == \"ppc64le\" or platform_machine == \"x86_64\" or platform_machine == \"amd64\" or platform_machine == \"AMD64\" or platform_machine == \"win32\" or platform_machine == \"WIN32\")"} +greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platform_machine == \"win32\" or platform_machine == \"WIN32\" or platform_machine == \"AMD64\" or platform_machine == \"amd64\" or platform_machine == \"x86_64\" or platform_machine == \"ppc64le\" or platform_machine == \"aarch64\")"} [package.extras] aiomysql = ["aiomysql", "greenlet (!=0.4.17)"] @@ -6517,7 +6250,6 @@ sqlcipher = ["sqlcipher3-binary"] name = "sqlalchemy2-stubs" version = "0.0.2a35" description = "Typing Stubs for SQLAlchemy 1.4" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -6532,7 +6264,6 @@ typing-extensions = ">=3.7.4" name = "sqlmodel" version = "0.0.8" description = "SQLModel, SQL databases in Python, designed for simplicity, compatibility, and robustness." -category = "main" optional = false python-versions = ">=3.6.1,<4.0.0" files = [ @@ -6549,7 +6280,6 @@ sqlalchemy2-stubs = "*" name = "stack-data" version = "0.6.2" description = "Extract data from python stack frames and tracebacks for informative displays" -category = "dev" optional = false python-versions = "*" files = [ @@ -6569,7 +6299,6 @@ tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"] name = "starlette" version = "0.27.0" description = "The little ASGI library that shines." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -6588,7 +6317,6 @@ full = ["httpx (>=0.22.0)", "itsdangerous", "jinja2", "python-multipart", "pyyam name = "storage3" version = "0.5.3" description = "Supabase Storage client for Python." -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -6605,7 +6333,6 @@ typing-extensions = ">=4.2.0,<5.0.0" name = "strenum" version = "0.4.15" description = "An Enum that inherits from str." -category = "main" optional = false python-versions = "*" files = [ @@ -6622,7 +6349,6 @@ test = ["pylint", "pytest", "pytest-black", "pytest-cov", "pytest-pylint"] name = "supabase" version = "1.0.3" description = "Supabase client for Python." -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -6643,7 +6369,6 @@ supafunc = ">=0.2.2,<0.3.0" name = "supafunc" version = "0.2.2" description = "Library for Supabase Functions" -category = "main" optional = false python-versions = ">=3.7,<4.0" files = [ @@ -6658,7 +6383,6 @@ httpx = ">=0.23.0,<0.24.0" name = "sympy" version = "1.12" description = "Computer algebra system (CAS) in Python" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -6673,7 +6397,6 @@ mpmath = ">=0.19" name = "tabulate" version = "0.9.0" description = "Pretty-print tabular data" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -6688,7 +6411,6 @@ widechars = ["wcwidth"] name = "tenacity" version = "8.2.3" description = "Retry code until it succeeds" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -6703,7 +6425,6 @@ doc = ["reno", "sphinx", "tornado (>=4.5)"] name = "textual" version = "0.33.0" description = "Modern Text User Interface framework" -category = "main" optional = true python-versions = ">=3.7,<4.0" files = [ @@ -6721,7 +6442,6 @@ typing-extensions = ">=4.4.0,<5.0.0" name = "threadpoolctl" version = "3.2.0" description = "threadpoolctl" -category = "main" optional = true python-versions = ">=3.8" files = [ @@ -6733,7 +6453,6 @@ files = [ name = "tiktoken" version = "0.4.0" description = "tiktoken is a fast BPE tokeniser for use with OpenAI's models" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -6779,7 +6498,6 @@ blobfile = ["blobfile (>=2)"] name = "tokenizers" version = "0.13.3" description = "Fast and Customizable Tokenizers" -category = "main" optional = false python-versions = "*" files = [ @@ -6834,7 +6552,6 @@ testing = ["black (==22.3)", "datasets", "numpy", "pytest", "requests"] name = "toml" version = "0.10.2" description = "Python Library for Tom's Obvious, Minimal Language" -category = "main" optional = true python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" files = [ @@ -6846,7 +6563,6 @@ files = [ name = "tomli" version = "2.0.1" description = "A lil' TOML parser" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -6858,7 +6574,6 @@ files = [ name = "tomlkit" version = "0.12.1" description = "Style preserving TOML library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -6870,7 +6585,6 @@ files = [ name = "torch" version = "2.0.1" description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration" -category = "main" optional = true python-versions = ">=3.8.0" files = [ @@ -6910,7 +6624,6 @@ opt-einsum = ["opt-einsum (>=3.3)"] name = "torchvision" version = "0.15.2" description = "image and video datasets and models for torch deep learning" -category = "main" optional = true python-versions = ">=3.8" files = [ @@ -6938,7 +6651,7 @@ files = [ [package.dependencies] numpy = "*" -pillow = ">=5.3.0,<8.3.0 || >=8.4.0" +pillow = ">=5.3.0,<8.3.dev0 || >=8.4.dev0" requests = "*" torch = "2.0.1" @@ -6949,7 +6662,6 @@ scipy = ["scipy"] name = "tornado" version = "6.3.3" description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." -category = "dev" optional = false python-versions = ">= 3.8" files = [ @@ -6970,7 +6682,6 @@ files = [ name = "tqdm" version = "4.66.1" description = "Fast, Extensible Progress Meter" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -6991,7 +6702,6 @@ telegram = ["requests"] name = "traitlets" version = "5.9.0" description = "Traitlets Python configuration system" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -7007,7 +6717,6 @@ test = ["argcomplete (>=2.0)", "pre-commit", "pytest", "pytest-mock"] name = "transformers" version = "4.31.0" description = "State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" -category = "main" optional = true python-versions = ">=3.8.0" files = [ @@ -7077,7 +6786,6 @@ vision = ["Pillow (<10.0.0)"] name = "twine" version = "3.8.0" description = "Collection of utilities for publishing packages on PyPI" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -7101,7 +6809,6 @@ urllib3 = ">=1.26.0" name = "typer" version = "0.9.0" description = "Typer, build great CLIs. Easy to code. Based on Python type hints." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -7123,7 +6830,6 @@ test = ["black (>=22.3.0,<23.0.0)", "coverage (>=6.2,<7.0)", "isort (>=5.0.6,<6. name = "types-appdirs" version = "1.4.3.5" description = "Typing stubs for appdirs" -category = "dev" optional = false python-versions = "*" files = [ @@ -7135,7 +6841,6 @@ files = [ name = "types-cachetools" version = "5.3.0.6" description = "Typing stubs for cachetools" -category = "main" optional = false python-versions = "*" files = [ @@ -7147,7 +6852,6 @@ files = [ name = "types-pillow" version = "9.5.0.6" description = "Typing stubs for Pillow" -category = "dev" optional = false python-versions = "*" files = [ @@ -7159,7 +6863,6 @@ files = [ name = "types-pytz" version = "2023.3.0.1" description = "Typing stubs for pytz" -category = "dev" optional = false python-versions = "*" files = [ @@ -7171,7 +6874,6 @@ files = [ name = "types-pyyaml" version = "6.0.12.11" description = "Typing stubs for PyYAML" -category = "dev" optional = false python-versions = "*" files = [ @@ -7183,7 +6885,6 @@ files = [ name = "types-requests" version = "2.31.0.2" description = "Typing stubs for requests" -category = "dev" optional = false python-versions = "*" files = [ @@ -7198,7 +6899,6 @@ types-urllib3 = "*" name = "types-urllib3" version = "1.26.25.14" description = "Typing stubs for urllib3" -category = "dev" optional = false python-versions = "*" files = [ @@ -7210,7 +6910,6 @@ files = [ name = "typing-extensions" version = "4.7.1" description = "Backported and Experimental Type Hints for Python 3.7+" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -7222,7 +6921,6 @@ files = [ name = "typing-inspect" version = "0.9.0" description = "Runtime inspection utilities for typing module." -category = "main" optional = false python-versions = "*" files = [ @@ -7238,7 +6936,6 @@ typing-extensions = ">=3.7.4" name = "tzdata" version = "2023.3" description = "Provider of IANA time zone data" -category = "main" optional = false python-versions = ">=2" files = [ @@ -7250,7 +6947,6 @@ files = [ name = "uc-micro-py" version = "1.0.2" description = "Micro subset of unicode data files for linkify-it-py projects." -category = "main" optional = true python-versions = ">=3.7" files = [ @@ -7265,7 +6961,6 @@ test = ["coverage", "pytest", "pytest-cov"] name = "unstructured" version = "0.7.12" description = "A library that prepares raw documents for downstream ML tasks." -category = "main" optional = false python-versions = ">=3.7.0" files = [ @@ -7313,7 +7008,6 @@ wikipedia = ["wikipedia"] name = "uritemplate" version = "4.1.1" description = "Implementation of RFC 6570 URI Templates" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -7325,7 +7019,6 @@ files = [ name = "urllib3" version = "1.26.16" description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" files = [ @@ -7342,7 +7035,6 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] name = "uvicorn" version = "0.22.0" description = "The lightning-fast ASGI server." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -7357,7 +7049,7 @@ h11 = ">=0.8" httptools = {version = ">=0.5.0", optional = true, markers = "extra == \"standard\""} python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} pyyaml = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} -uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "(sys_platform != \"win32\" and sys_platform != \"cygwin\") and platform_python_implementation != \"PyPy\" and extra == \"standard\""} watchfiles = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} websockets = {version = ">=10.4", optional = true, markers = "extra == \"standard\""} @@ -7368,7 +7060,6 @@ standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)", name = "uvloop" version = "0.17.0" description = "Fast implementation of asyncio event loop on top of libuv" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -7413,7 +7104,6 @@ test = ["Cython (>=0.29.32,<0.30.0)", "aiohttp", "flake8 (>=3.9.2,<3.10.0)", "my name = "validators" version = "0.21.0" description = "Python Data Validation for Humans™" -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -7425,7 +7115,6 @@ files = [ name = "watchfiles" version = "0.19.0" description = "Simple, modern and high performance file watching and code reload in python." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -7460,7 +7149,6 @@ anyio = ">=3.0.0" name = "wcwidth" version = "0.2.6" description = "Measures the displayed width of unicode strings in a terminal" -category = "dev" optional = false python-versions = "*" files = [ @@ -7472,7 +7160,6 @@ files = [ name = "weaviate-client" version = "3.22.1" description = "A python native Weaviate client" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -7493,7 +7180,6 @@ grpc = ["grpcio", "grpcio-tools"] name = "webencodings" version = "0.5.1" description = "Character encoding aliases for legacy web content" -category = "main" optional = false python-versions = "*" files = [ @@ -7505,7 +7191,6 @@ files = [ name = "websocket-client" version = "1.6.1" description = "WebSocket client for Python with low level API options" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -7522,7 +7207,6 @@ test = ["websockets"] name = "websockets" version = "10.4" description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -7601,7 +7285,6 @@ files = [ name = "wheel" version = "0.41.1" description = "A built-package format for Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -7616,7 +7299,6 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] name = "wikipedia" version = "1.4.0" description = "Wikipedia API for Python" -category = "main" optional = false python-versions = "*" files = [ @@ -7631,7 +7313,6 @@ requests = ">=2.0.0,<3.0.0" name = "win32-setctime" version = "1.1.0" description = "A small Python utility to set file creation time on Windows" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -7646,7 +7327,6 @@ dev = ["black (>=19.3b0)", "pytest (>=4.6.2)"] name = "wrapt" version = "1.15.0" description = "Module for decorators, wrappers and monkey patching." -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" files = [ @@ -7731,7 +7411,6 @@ files = [ name = "xlrd" version = "2.0.1" description = "Library for developers to extract data from Microsoft Excel (tm) .xls spreadsheet files" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" files = [ @@ -7748,7 +7427,6 @@ test = ["pytest", "pytest-cov"] name = "xlsxwriter" version = "3.1.2" description = "A Python module for creating Excel XLSX files." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -7760,7 +7438,6 @@ files = [ name = "yarl" version = "1.9.2" description = "Yet another URL library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -7848,7 +7525,6 @@ multidict = ">=4.0" name = "zipp" version = "3.16.2" description = "Backport of pathlib-compatible object wrapper for zip files" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -7864,7 +7540,6 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p name = "zstandard" version = "0.21.0" description = "Zstandard bindings for Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -7922,7 +7597,7 @@ cffi = ["cffi (>=1.11)"] [extras] all = [] deploy = ["langchain-serve"] -local = ["llama-cpp-python", "sentence-transformers", "ctransformers"] +local = ["ctransformers", "llama-cpp-python", "sentence-transformers"] [metadata] lock-version = "2.0" diff --git a/pyproject.toml b/pyproject.toml index b1f011a34..9541dd0dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "langflow" -version = "0.4.11" +version = "0.4.12" description = "A Python package with a built-in web application" authors = ["Logspace "] maintainers = [ From 59bfabd11906ca8792017a49d64d34ac5e7f1fef Mon Sep 17 00:00:00 2001 From: carlosrcoelho Date: Fri, 18 Aug 2023 12:59:58 -0300 Subject: [PATCH 006/134] fix mendable --- docs/src/theme/Footer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/theme/Footer.js b/docs/src/theme/Footer.js index 403eb4382..d2a56bf5a 100644 --- a/docs/src/theme/Footer.js +++ b/docs/src/theme/Footer.js @@ -37,7 +37,7 @@ export default function FooterWrapper(props) { const mendableFloatingButton = React.createElement(MendableFloatingButton, { floatingButtonStyle: { color: "#000000", backgroundColor: "#f6f6f6" }, - anon_key: customFields.mendableAnonKey, // Mendable Search Public ANON key, ok to be public + anon_key: 'b7f52734-297c-41dc-8737-edbd13196394', // Mendable Search Public ANON key, ok to be public showSimpleSearch: true, icon: icon, }); From 5e7681ea09d83a849da6c26cbc57d3378e1db018 Mon Sep 17 00:00:00 2001 From: DiogenesBR Date: Fri, 18 Aug 2023 16:58:18 -0300 Subject: [PATCH 007/134] Add some new types to .gitattributes --- .gitattributes | 12 +++++- src/frontend/src/icons/Airbyte/airbyte.svg | 44 +++++++++++----------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/.gitattributes b/.gitattributes index b69d73e97..5957bfeff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,14 +7,22 @@ *.h text *.py text *.js text -*.ts text *.jsx text +*.ts text +*.tsx text *.md text *.mdx text +*.svg text +*.yml text +*.yaml text +*.Dockerfile text # Declare files that will always have CRLF line endings on checkout. *.sln text eol=crlf # Denote all files that are truly binary and should not be modified. *.png binary -*.jpg binary \ No newline at end of file +*.jpg binary +*.ico binary +*.gif binary +*.mp4 binary \ No newline at end of file diff --git a/src/frontend/src/icons/Airbyte/airbyte.svg b/src/frontend/src/icons/Airbyte/airbyte.svg index eefa1bceb..a7275179d 100644 --- a/src/frontend/src/icons/Airbyte/airbyte.svg +++ b/src/frontend/src/icons/Airbyte/airbyte.svg @@ -1,22 +1,22 @@ - - - - - - + + + + + + From 5fd3da010e244bad1ccf59b647ce8e8efc833a03 Mon Sep 17 00:00:00 2001 From: DiogenesBR Date: Fri, 18 Aug 2023 21:10:03 +0000 Subject: [PATCH 008/134] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20do=20ChromaComp?= =?UTF-8?q?onent=20adicionando=20campos=20que=20havia=20na=20vers=C3=A3o?= =?UTF-8?q?=20antiga?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 6 +++ .../components/vectorstores/Chroma.py | 40 +++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/Makefile b/Makefile index b1d42ff4e..c0c6a7abc 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,12 @@ install_frontendc: run_frontend: cd src/frontend && npm start +run_cli: + poetry run langflow --path src/frontend/build + +run_cli_debug: + poetry run langflow --path src/frontend/build --log-level debug + setup_devcontainer: make init make build_frontend diff --git a/src/backend/langflow/components/vectorstores/Chroma.py b/src/backend/langflow/components/vectorstores/Chroma.py index d064af80e..38e675d9d 100644 --- a/src/backend/langflow/components/vectorstores/Chroma.py +++ b/src/backend/langflow/components/vectorstores/Chroma.py @@ -6,6 +6,7 @@ from langchain.schema import Document from langchain.vectorstores.base import VectorStore from langchain.schema import BaseRetriever from langchain.embeddings.base import Embeddings +import chromadb class ChromaComponent(CustomComponent): @@ -32,15 +33,34 @@ class ChromaComponent(CustomComponent): "code": {"show": False, "display_name": "Code"}, "documents": {"display_name": "Documents", "is_list": True}, "embedding": {"display_name": "Embedding"}, + "chroma_server_cors_allow_origins": { + "display_name": "Server CORS Allow Origins", + "advanced": True, + }, + "chroma_server_host": {"display_name": "Server Host", "advanced": True}, + "chroma_server_port": {"display_name": "Server Port", "advanced": True}, + "chroma_server_grpc_port": { + "display_name": "Server gRPC Port", + "advanced": True, + }, + "chroma_server_ssl_enabled": { + "display_name": "Server SSL Enabled", + "advanced": True, + }, } def build( self, collection_name: str, persist: bool, + chroma_server_ssl_enabled: bool, persist_directory: Optional[str] = None, embedding: Optional[Embeddings] = None, documents: Optional[Document] = None, + chroma_server_cors_allow_origins: Optional[str] = None, + chroma_server_host: Optional[str] = None, + chroma_server_port: Optional[int] = None, + chroma_server_grpc_port: Optional[int] = None, ) -> Union[VectorStore, BaseRetriever]: """ Builds the Vector Store or BaseRetriever object. @@ -48,13 +68,32 @@ class ChromaComponent(CustomComponent): Args: - collection_name (str): The name of the collection. - persist_directory (Optional[str]): The directory to persist the Vector Store to. + - chroma_server_ssl_enabled (bool): Whether to enable SSL for the Chroma server. - persist (bool): Whether to persist the Vector Store or not. - embedding (Optional[Embeddings]): The embeddings to use for the Vector Store. - documents (Optional[Document]): The documents to use for the Vector Store. + - chroma_server_cors_allow_origins (Optional[str]): The CORS allow origins for the Chroma server. + - chroma_server_host (Optional[str]): The host for the Chroma server. + - chroma_server_port (Optional[int]): The port for the Chroma server. + - chroma_server_grpc_port (Optional[int]): The gRPC port for the Chroma server. Returns: - Union[VectorStore, BaseRetriever]: The Vector Store or BaseRetriever object. """ + + # Chroma settings + chroma_settings = None + + if chroma_server_host is not None: + chroma_settings = chromadb.config.Settings( + chroma_server_cors_allow_origins=chroma_server_cors_allow_origins + or None, + chroma_server_host=chroma_server_host, + chroma_server_port=chroma_server_port or None, + chroma_server_grpc_port=chroma_server_grpc_port or None, + chroma_server_ssl_enabled=chroma_server_ssl_enabled, + ) + # If documents, then we need to create a Chroma instance using .from_documents if documents is not None and embedding is not None: return Chroma.from_documents( @@ -62,6 +101,7 @@ class ChromaComponent(CustomComponent): persist_directory=persist_directory if persist else None, collection_name=collection_name, embedding=embedding, + client_settings=chroma_settings, ) return Chroma( From 53722f3f1d5e6c33ddfbebe0665665df11ff2ec3 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 14:54:09 -0300 Subject: [PATCH 009/134] =?UTF-8?q?=F0=9F=94=A7=20chore(devcontainer.json)?= =?UTF-8?q?:=20update=20devcontainer.json=20for=20Langflow=20Demo=20Contai?= =?UTF-8?q?ner=20=F0=9F=94=A7=20chore(devcontainer.json):=20update=20devco?= =?UTF-8?q?ntainer.json=20for=20Langflow=20Dev=20Container?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/demo/devcontainer.json | 59 ++++++++++++++-------------- .devcontainer/devcontainer.json | 58 +++++++++++++++------------ 2 files changed, 62 insertions(+), 55 deletions(-) diff --git a/.devcontainer/demo/devcontainer.json b/.devcontainer/demo/devcontainer.json index 1febd3cf5..0fb998b81 100644 --- a/.devcontainer/demo/devcontainer.json +++ b/.devcontainer/demo/devcontainer.json @@ -1,32 +1,33 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the // README at: https://github.com/devcontainers/templates/tree/main/src/universal { - "name": "LangChain Demo Container", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/python:3.10", - "features": { - "ghcr.io/devcontainers/features/aws-cli:1": {}, - "ghcr.io/devcontainers/features/docker-in-docker": {}, - "ghcr.io/devcontainers/features/node": {} - }, - "customizations": { - "vscode": { - "extensions": [ - "actboy168.tasks", - "GitHub.copilot", - "ms-python.python", - "eamodio.gitlens" - ] - } - }, - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - // Use 'postCreateCommand' to run commands after the container is created. - "postCreateCommand": "pipx install 'langflow>=0.0.33' && langflow --host 0.0.0.0" - // Configure tool-specific properties. - // "customizations": {}, - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" -} \ No newline at end of file + "name": "Langflow Demo Container", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "image": "mcr.microsoft.com/devcontainers/python:3.10", + "features": { + "ghcr.io/devcontainers/features/aws-cli:1": {}, + "ghcr.io/devcontainers/features/docker-in-docker": {}, + "ghcr.io/devcontainers/features/node": {} + }, + "customizations": { + "vscode": { + "extensions": [ + "actboy168.tasks", + "GitHub.copilot", + "ms-python.python", + "eamodio.gitlens", + "GitHub.vscode-pull-request-github" + ] + } + }, + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + // Use 'postCreateCommand' to run commands after the container is created. + "postCreateCommand": "pipx install 'langflow>=0.0.33' && langflow --host 0.0.0.0" + // Configure tool-specific properties. + // "customizations": {}, + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 282ff4ad3..90966fb38 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,35 +1,41 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the // README at: https://github.com/devcontainers/templates/tree/main/src/universal { - "name": "LangChain Dev Container", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/universal:2-linux", - "features": { - "ghcr.io/devcontainers/features/aws-cli:1": {}, - "ghcr.io/devcontainers/features/docker-in-docker": {} - }, - "customizations": { - "vscode": {"extensions": [ - "actboy168.tasks", - "GitHub.copilot", - "ms-python.python", - "sourcery.sourcery", - "eamodio.gitlens" - ]} - }, + "name": "Langflow Dev Container", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "image": "mcr.microsoft.com/devcontainers/python:1-3.10-bullseye", - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, + // Features to add to the dev container. More info: https://containers.dev/features. + "features": { + "ghcr.io/devcontainers/features/node": {}, + "ghcr.io/devcontainers-contrib/features/poetry": {} + }, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], - // Use 'postCreateCommand' to run commands after the container is created. - "postCreateCommand": "poetry install" + // Use 'postCreateCommand' to run commands after the container is created. + "postCreateCommand": "make install_frontend && make install_backend", - // Configure tool-specific properties. - // "customizations": {}, + "containerEnv": { + "POETRY_VIRTUALENVS_IN_PROJECT": "true" + }, - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" + // Configure tool-specific properties. + "customizations": { + "vscode": { + "extensions": [ + "actboy168.tasks", + "GitHub.copilot", + "ms-python.python", + "sourcery.sourcery", + "eamodio.gitlens", + "ms-vscode.makefile-tools", + "GitHub.vscode-pull-request-github" + ] + } + } + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" } From 3d5cf8409582c3f22c03c7db62186ba20b2c74bf Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 15:59:51 -0300 Subject: [PATCH 010/134] =?UTF-8?q?=F0=9F=93=A6=20feat(models):=20add=20To?= =?UTF-8?q?ken=20model=20to=20represent=20access=20and=20refresh=20tokens?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 📦 feat(models): add User model to represent user data 📦 feat(models): add UserAddModel, UserListModel, UserPatchModel, and UsersResponse models for user CRUD operations 📦 feat(models): add get_user_by_username and get_user_by_id functions to retrieve user data from the database 📦 feat(models): add update_user function to update user data in the database 📦 feat(models): add update_user_last_login_at function to update the last login timestamp of a user --- .../{ => services}/database/models/token.py | 0 .../{ => services}/database/models/user.py | 21 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) rename src/backend/langflow/{ => services}/database/models/token.py (100%) rename src/backend/langflow/{ => services}/database/models/user.py (93%) diff --git a/src/backend/langflow/database/models/token.py b/src/backend/langflow/services/database/models/token.py similarity index 100% rename from src/backend/langflow/database/models/token.py rename to src/backend/langflow/services/database/models/token.py diff --git a/src/backend/langflow/database/models/user.py b/src/backend/langflow/services/database/models/user.py similarity index 93% rename from src/backend/langflow/database/models/user.py rename to src/backend/langflow/services/database/models/user.py index 94ceb4e15..f9a3c80f8 100644 --- a/src/backend/langflow/database/models/user.py +++ b/src/backend/langflow/services/database/models/user.py @@ -1,14 +1,15 @@ -from sqlmodel import Field -from uuid import UUID, uuid4 -from pydantic import BaseModel -from typing import Optional, List -from sqlalchemy.orm import Session -from datetime import timezone, datetime -from sqlalchemy.exc import IntegrityError -from fastapi import HTTPException, Depends - +from fastapi import Depends, HTTPException +from langflow.services.database.models.base import SQLModel, SQLModelSerializable from langflow.services.utils import get_session -from langflow.services.database.models.base import SQLModelSerializable, SQLModel +from pydantic import BaseModel +from sqlalchemy.exc import IntegrityError +from sqlalchemy.orm import Session +from sqlmodel import Field + + +from datetime import datetime, timezone +from typing import List, Optional +from uuid import UUID, uuid4 class User(SQLModelSerializable, table=True): From f4d12f27e670bfb2de8f9ad185fbbdfa209dd0d8 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 16:12:49 -0300 Subject: [PATCH 011/134] Adds new AuthSettings --- .../langflow/services/auth/__init__.py | 0 src/backend/langflow/services/auth/factory.py | 0 src/backend/langflow/services/auth/service.py | 228 ++++++++++++++++++ .../langflow/services/settings/auth.py | 29 +++ .../langflow/services/settings/base.py | 19 -- .../langflow/services/settings/manager.py | 7 +- 6 files changed, 262 insertions(+), 21 deletions(-) create mode 100644 src/backend/langflow/services/auth/__init__.py create mode 100644 src/backend/langflow/services/auth/factory.py create mode 100644 src/backend/langflow/services/auth/service.py create mode 100644 src/backend/langflow/services/settings/auth.py diff --git a/src/backend/langflow/services/auth/__init__.py b/src/backend/langflow/services/auth/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/backend/langflow/services/auth/factory.py b/src/backend/langflow/services/auth/factory.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/backend/langflow/services/auth/service.py b/src/backend/langflow/services/auth/service.py new file mode 100644 index 000000000..5e25aa207 --- /dev/null +++ b/src/backend/langflow/services/auth/service.py @@ -0,0 +1,228 @@ +from uuid import UUID +from typing import Annotated +from jose import JWTError, jwt +from langflow.services.base import Service +from langflow.services.database.models.user import ( + User, + get_user_by_id, + get_user_by_username, +) +from sqlalchemy.orm import Session +from passlib.context import CryptContext +from fastapi.security import OAuth2PasswordBearer +from fastapi import Depends, HTTPException, status +from datetime import datetime, timedelta, timezone + +from langflow.services.utils import get_settings_manager, get_session + +from langflow.services.database.models.user import ( + update_user_last_login_at, +) + + +pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") +oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login") + + +class AuthManager(Service): + name = "auth_manager" + + def __init__(self): + self.pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") + self.oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login") + + +async def get_current_user( + token: Annotated[str, Depends(oauth2_scheme)], db: Session = Depends(get_session) +) -> User: + settings_manager = get_settings_manager() + + credentials_exception = HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Could not validate credentials", + headers={"WWW-Authenticate": "Bearer"}, + ) + + try: + payload = jwt.decode( + token, + settings_manager.auth_settings.SECRET_KEY, + algorithms=[settings_manager.auth_settings.ALGORITHM], + ) + user_id: UUID = payload.get("sub") # type: ignore + token_type: str = payload.get("type") # type: ignore + + if user_id is None or token_type: + raise credentials_exception + except JWTError as e: + raise credentials_exception from e + + user = get_user_by_id(db, user_id) # type: ignore + if user is None: + raise credentials_exception + return user + + +async def get_current_active_user( + current_user: Annotated[User, Depends(get_current_user)] +): + if not current_user.is_active: + raise HTTPException(status_code=400, detail="Inactive user") + return current_user + + +def verify_password(plain_password, hashed_password): + return pwd_context.verify(plain_password, hashed_password) + + +def get_password_hash(password): + return pwd_context.hash(password) + + +def create_token(data: dict, expires_delta: timedelta): + settings_manager = get_settings_manager() + + to_encode = data.copy() + expire = datetime.now(timezone.utc) + expires_delta + to_encode["exp"] = expire + + return jwt.encode( + to_encode, + settings_manager.auth_settings.SECRET_KEY, + algorithm=settings_manager.auth_settings.ALGORITHM, + ) + + +def create_super_user(db: Session = Depends(get_session)) -> User: + settings_manager = get_settings_manager() + + super_user = get_user_by_username( + db, settings_manager.auth_settings.FIRST_SUPERUSER + ) + + if not super_user: + super_user = User( + username=settings_manager.auth_settings.FIRST_SUPERUSER, + password=get_password_hash( + settings_manager.auth_settings.FIRST_SUPERUSER_PASSWORD + ), + is_superuser=True, + is_active=True, + last_login_at=None, + ) + + db.add(super_user) + db.commit() + db.refresh(super_user) + + return super_user + + +def create_user_longterm_token(db: Session = Depends(get_session)) -> dict: + super_user = create_super_user(db) + + access_token_expires_longterm = timedelta(days=365) + access_token = create_token( + data={"sub": str(super_user.id)}, + expires_delta=access_token_expires_longterm, + ) + + # Update: last_login_at + update_user_last_login_at(super_user.id, db) + + return { + "access_token": access_token, + "refresh_token": None, + "token_type": "bearer", + } + + +def create_user_api_key(user_id: UUID) -> dict: + access_token = create_token( + data={"sub": str(user_id), "role": "api_key"}, + expires_delta=timedelta(days=365 * 2), + ) + + return {"api_key": access_token} + + +def get_user_id_from_token(token: str) -> UUID: + try: + user_id = jwt.get_unverified_claims(token)["sub"] + return UUID(user_id) + except (KeyError, JWTError, ValueError): + return UUID(int=0) + + +def create_user_tokens( + user_id: UUID, db: Session = Depends(get_session), update_last_login: bool = False +) -> dict: + settings_manager = get_settings_manager() + + access_token_expires = timedelta( + minutes=settings_manager.auth_settings.ACCESS_TOKEN_EXPIRE_MINUTES + ) + access_token = create_token( + data={"sub": str(user_id)}, + expires_delta=access_token_expires, + ) + + refresh_token_expires = timedelta( + minutes=settings_manager.auth_settings.REFRESH_TOKEN_EXPIRE_MINUTES + ) + refresh_token = create_token( + data={"sub": str(user_id), "type": "rf"}, + expires_delta=refresh_token_expires, + ) + + # Update: last_login_at + if update_last_login: + update_user_last_login_at(user_id, db) + + return { + "access_token": access_token, + "refresh_token": refresh_token, + "token_type": "bearer", + } + + +def create_refresh_token(refresh_token: str, db: Session = Depends(get_session)): + settings_manager = get_settings_manager() + + try: + payload = jwt.decode( + refresh_token, + settings_manager.auth_settings.SECRET_KEY, + algorithms=[settings_manager.auth_settings.ALGORITHM], + ) + user_id: UUID = payload.get("sub") # type: ignore + token_type: str = payload.get("type") # type: ignore + + if user_id is None or token_type is None: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid refresh token" + ) + + return create_user_tokens(user_id, db) + + except JWTError as e: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Invalid refresh token", + ) from e + + +def authenticate_user( + username: str, password: str, db: Session = Depends(get_session) +) -> User | None: + user = get_user_by_username(db, username) + + if not user: + return None + + if not user.is_active: + if not user.last_login_at: + raise HTTPException(status_code=400, detail="Waiting for approval") + raise HTTPException(status_code=400, detail="Inactive user") + + return user if verify_password(password, user.password) else None diff --git a/src/backend/langflow/services/settings/auth.py b/src/backend/langflow/services/settings/auth.py new file mode 100644 index 000000000..d144b4347 --- /dev/null +++ b/src/backend/langflow/services/settings/auth.py @@ -0,0 +1,29 @@ +from typing import Optional +import secrets + +from pydantic import BaseSettings + + +class AuthSettings(BaseSettings): + # Login settings + SECRET_KEY: str = secrets.token_hex(32) + ALGORITHM: str = "HS256" + ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 + REFRESH_TOKEN_EXPIRE_MINUTES: int = 70 + + # API Key to execute /process endpoint + API_KEY_SECRET_KEY: Optional[ + str + ] = "b82818e0ad4ff76615c5721ee21004b07d84cd9b87ba4d9cb42374da134b841a" + API_KEY_ALGORITHM: str = "HS256" + + # If AUTO_LOGIN = True + # > The application does not request login and logs in automatically as a super user. + AUTO_LOGIN: bool = True + FIRST_SUPERUSER: str = "langflow" + FIRST_SUPERUSER_PASSWORD: str = "langflow" + + class Config: + validate_assignment = True + extra = "ignore" + env_prefix = "LANGFLOW_" diff --git a/src/backend/langflow/services/settings/base.py b/src/backend/langflow/services/settings/base.py index 65a1a2909..4e1e2d35b 100644 --- a/src/backend/langflow/services/settings/base.py +++ b/src/backend/langflow/services/settings/base.py @@ -2,7 +2,6 @@ import contextlib import json import os from shutil import copy2 -import secrets from typing import Optional, List from pathlib import Path @@ -41,24 +40,6 @@ class Settings(BaseSettings): REMOVE_API_KEYS: bool = False COMPONENTS_PATH: List[str] = [] - # Login settings - SECRET_KEY: str = secrets.token_hex(32) - ALGORITHM: str = "HS256" - ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 - REFRESH_TOKEN_EXPIRE_MINUTES: int = 70 - - # API Key to execute /process endpoint - API_KEY_SECRET_KEY: Optional[ - str - ] = "b82818e0ad4ff76615c5721ee21004b07d84cd9b87ba4d9cb42374da134b841a" - API_KEY_ALGORITHM: str = "HS256" - - # If AUTO_LOGIN = True - # > The application does not request login and logs in automatically as a super user. - AUTO_LOGIN: bool = True - FIRST_SUPERUSER: str = "langflow" - FIRST_SUPERUSER_PASSWORD: str = "langflow" - @validator("CONFIG_DIR", pre=True, allow_reuse=True) def set_langflow_dir(cls, value): if not value: diff --git a/src/backend/langflow/services/settings/manager.py b/src/backend/langflow/services/settings/manager.py index a357c4804..1a6c0feeb 100644 --- a/src/backend/langflow/services/settings/manager.py +++ b/src/backend/langflow/services/settings/manager.py @@ -1,4 +1,5 @@ from langflow.services.base import Service +from langflow.services.settings.auth import AuthSettings from langflow.services.settings.base import Settings from langflow.utils.logger import logger import os @@ -8,9 +9,10 @@ import yaml class SettingsManager(Service): name = "settings_manager" - def __init__(self, settings: Settings): + def __init__(self, settings: Settings, auth_settings: AuthSettings): super().__init__() self.settings = settings + self.auth_settings = auth_settings @classmethod def load_settings_from_yaml(cls, file_path: str) -> "SettingsManager": @@ -33,4 +35,5 @@ class SettingsManager(Service): ) settings = Settings(**settings_dict) - return cls(settings) + auth_settings = AuthSettings() + return cls(settings, auth_settings) From e6bd9a07d520d559ad9065b4f75ce286fef30f8a Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 16:33:27 -0300 Subject: [PATCH 012/134] =?UTF-8?q?=F0=9F=94=A7=20fix(auth.py):=20update?= =?UTF-8?q?=20import=20statements=20for=20User=20model=20and=20related=20f?= =?UTF-8?q?unctions=20to=20match=20new=20file=20structure=20=F0=9F=94=A7?= =?UTF-8?q?=20fix(auth.py):=20update=20import=20statements=20for=20setting?= =?UTF-8?q?s=5Fmanager=20and=20related=20settings=20to=20match=20new=20fil?= =?UTF-8?q?e=20structure=20=F0=9F=94=A7=20fix(auth.py):=20update=20referen?= =?UTF-8?q?ces=20to=20settings=5Fmanager.settings=20to=20settings=5Fmanage?= =?UTF-8?q?r.auth=5Fsettings=20to=20match=20new=20file=20structure=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(auth.py):=20update=20references=20to=20setti?= =?UTF-8?q?ngs=5Fmanager.settings=20to=20settings=5Fmanager.auth=5Fsetting?= =?UTF-8?q?s=20to=20match=20new=20file=20structure=20=F0=9F=94=A7=20fix(au?= =?UTF-8?q?th.py):=20update=20references=20to=20settings=5Fmanager.setting?= =?UTF-8?q?s=20to=20settings=5Fmanager.auth=5Fsettings=20to=20match=20new?= =?UTF-8?q?=20file=20structure=20=F0=9F=94=A7=20fix(auth.py):=20update=20r?= =?UTF-8?q?eferences=20to=20settings=5Fmanager.settings=20to=20settings=5F?= =?UTF-8?q?manager.auth=5Fsettings=20to=20match=20new=20file=20structure?= =?UTF-8?q?=20=F0=9F=94=A7=20fix(auth.py):=20update=20references=20to=20se?= =?UTF-8?q?ttings=5Fmanager.settings=20to=20settings=5Fmanager.auth=5Fsett?= =?UTF-8?q?ings=20to=20match=20new=20file=20structure=20=F0=9F=94=A7=20fix?= =?UTF-8?q?(auth.py):=20update=20references=20to=20settings=5Fmanager.sett?= =?UTF-8?q?ings=20to=20settings=5Fmanager.auth=5Fsettings=20to=20match=20n?= =?UTF-8?q?ew=20file=20structure=20=F0=9F=94=A7=20fix(auth.py):=20update?= =?UTF-8?q?=20references=20to=20settings=5Fmanager.settings=20to=20setting?= =?UTF-8?q?s=5Fmanager.auth=5Fsettings=20to=20match=20new=20file=20structu?= =?UTF-8?q?re=20=F0=9F=94=A7=20fix(auth.py):=20update=20references=20to=20?= =?UTF-8?q?settings=5Fmanager.settings=20to=20settings=5Fmanager.auth=5Fse?= =?UTF-8?q?ttings=20to=20match=20new=20file=20structure=20=F0=9F=94=A7=20f?= =?UTF-8?q?ix(auth.py):=20update=20references=20to=20settings=5Fmanager.se?= =?UTF-8?q?ttings=20to=20settings=5Fmanager.auth=5Fsettings=20to=20match?= =?UTF-8?q?=20new=20file=20structure=20=F0=9F=94=A7=20fix(auth.py):=20upda?= =?UTF-8?q?te=20references=20to=20settings=5Fmanager.settings=20to=20setti?= =?UTF-8?q?ngs=5Fmanager.auth=5Fsettings=20to=20match=20new=20file=20struc?= =?UTF-8?q?ture=20=F0=9F=94=A7=20fix(auth.py):=20update=20references=20to?= =?UTF-8?q?=20settings=5Fmanager.settings=20to=20settings=5Fmanager.auth?= =?UTF-8?q?=5Fsettings=20to=20match=20new=20file=20structure=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(auth.py):=20update=20references=20to=20setti?= =?UTF-8?q?ngs=5Fmanager.settings=20to=20settings=5Fmanager.auth=5Fsetting?= =?UTF-8?q?s=20to=20match=20new=20file=20structure=20=F0=9F=94=A7=20fix(au?= =?UTF-8?q?th.py):=20update=20references=20to=20settings=5Fmanager.setting?= =?UTF-8?q?s=20to=20settings=5Fmanager.auth=5Fsettings=20to=20match=20new?= =?UTF-8?q?=20file=20structure=20=F0=9F=94=A7=20fix(auth.py):=20update=20r?= =?UTF-8?q?eferences=20to=20settings=5Fmanager.settings=20to=20settings=5F?= =?UTF-8?q?manager.auth=5Fsettings=20to=20match=20new=20file=20structure?= =?UTF-8?q?=20=F0=9F=94=A7=20fix(auth.py):=20update=20references=20to=20se?= =?UTF-8?q?ttings=5Fmanager.settings=20to=20settings=5Fmanager.auth=5Fsett?= =?UTF-8?q?ings=20to=20match=20new=20file=20structure=20=F0=9F=94=A7=20fix?= =?UTF-8?q?(auth.py):=20update=20references=20to=20settings=5Fmanager.sett?= =?UTF-8?q?ings=20to=20settings=5Fmanager.auth=5Fsettings=20to=20match=20n?= =?UTF-8?q?ew=20file=20structure=20=F0=9F=94=A7=20fix(auth.py):=20update?= =?UTF-8?q?=20references=20to=20settings=5Fmanager.settings=20to=20setting?= =?UTF-8?q?s=5Fmanager.auth=5Fsettings=20to=20match=20new=20file=20structu?= =?UTF-8?q?re=20=F0=9F=94=A7=20fix(auth.py):=20update=20references=20to=20?= =?UTF-8?q?settings=5Fmanager.settings=20to=20settings=5Fmanager.auth=5Fse?= =?UTF-8?q?ttings=20to=20match=20new=20file=20structure=20=F0=9F=94=A7=20f?= =?UTF-8?q?ix(auth.py):=20update=20references=20to=20settings=5Fmanager.se?= =?UTF-8?q?ttings=20to=20settings=5Fmanager.auth=5Fsettings=20to=20match?= =?UTF-8?q?=20new=20file=20structure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/auth/auth.py | 34 +++++++++++++++------------ src/backend/langflow/routers/login.py | 4 ++-- src/backend/langflow/routers/users.py | 14 ++++++----- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/backend/langflow/auth/auth.py b/src/backend/langflow/auth/auth.py index 9d4f12862..f274a9523 100644 --- a/src/backend/langflow/auth/auth.py +++ b/src/backend/langflow/auth/auth.py @@ -1,6 +1,11 @@ from uuid import UUID from typing import Annotated from jose import JWTError, jwt +from langflow.services.database.models.user import ( + User, + get_user_by_id, + get_user_by_username, +) from sqlalchemy.orm import Session from passlib.context import CryptContext from fastapi.security import OAuth2PasswordBearer @@ -9,10 +14,7 @@ from datetime import datetime, timedelta, timezone from langflow.services.utils import get_settings_manager, get_session -from langflow.database.models.user import ( - User, - get_user_by_id, - get_user_by_username, +from langflow.services.database.models.user import ( update_user_last_login_at, ) @@ -35,8 +37,8 @@ async def get_current_user( try: payload = jwt.decode( token, - settings_manager.settings.SECRET_KEY, - algorithms=[settings_manager.settings.ALGORITHM], + settings_manager.auth_settings.SECRET_KEY, + algorithms=[settings_manager.auth_settings.ALGORITHM], ) user_id: UUID = payload.get("sub") # type: ignore token_type: str = payload.get("type") # type: ignore @@ -77,21 +79,23 @@ def create_token(data: dict, expires_delta: timedelta): return jwt.encode( to_encode, - settings_manager.settings.SECRET_KEY, - algorithm=settings_manager.settings.ALGORITHM, + settings_manager.auth_settings.SECRET_KEY, + algorithm=settings_manager.auth_settings.ALGORITHM, ) def create_super_user(db: Session = Depends(get_session)) -> User: settings_manager = get_settings_manager() - super_user = get_user_by_username(db, settings_manager.settings.FIRST_SUPERUSER) + super_user = get_user_by_username( + db, settings_manager.auth_settings.FIRST_SUPERUSER + ) if not super_user: super_user = User( - username=settings_manager.settings.FIRST_SUPERUSER, + username=settings_manager.auth_settings.FIRST_SUPERUSER, password=get_password_hash( - settings_manager.settings.FIRST_SUPERUSER_PASSWORD + settings_manager.auth_settings.FIRST_SUPERUSER_PASSWORD ), is_superuser=True, is_active=True, @@ -147,7 +151,7 @@ def create_user_tokens( settings_manager = get_settings_manager() access_token_expires = timedelta( - minutes=settings_manager.settings.ACCESS_TOKEN_EXPIRE_MINUTES + minutes=settings_manager.auth_settings.ACCESS_TOKEN_EXPIRE_MINUTES ) access_token = create_token( data={"sub": str(user_id)}, @@ -155,7 +159,7 @@ def create_user_tokens( ) refresh_token_expires = timedelta( - minutes=settings_manager.settings.REFRESH_TOKEN_EXPIRE_MINUTES + minutes=settings_manager.auth_settings.REFRESH_TOKEN_EXPIRE_MINUTES ) refresh_token = create_token( data={"sub": str(user_id), "type": "rf"}, @@ -179,8 +183,8 @@ def create_refresh_token(refresh_token: str, db: Session = Depends(get_session)) try: payload = jwt.decode( refresh_token, - settings_manager.settings.SECRET_KEY, - algorithms=[settings_manager.settings.ALGORITHM], + settings_manager.auth_settings.SECRET_KEY, + algorithms=[settings_manager.auth_settings.ALGORITHM], ) user_id: UUID = payload.get("sub") # type: ignore token_type: str = payload.get("type") # type: ignore diff --git a/src/backend/langflow/routers/login.py b/src/backend/langflow/routers/login.py index de255a0d5..6a103d646 100644 --- a/src/backend/langflow/routers/login.py +++ b/src/backend/langflow/routers/login.py @@ -3,7 +3,7 @@ from fastapi import APIRouter, Depends, HTTPException, status from fastapi.security import OAuth2PasswordRequestForm from langflow.services.utils import get_session -from langflow.database.models.token import Token +from langflow.services.database.models import Token from langflow.auth.auth import ( authenticate_user, create_user_tokens, @@ -36,7 +36,7 @@ async def login_to_get_access_token( async def auto_login(db: Session = Depends(get_session)): settings_manager = get_settings_manager() - if settings_manager.settings.AUTO_LOGIN: + if settings_manager.auth_settings.AUTO_LOGIN: return create_user_longterm_token(db) raise HTTPException( diff --git a/src/backend/langflow/routers/users.py b/src/backend/langflow/routers/users.py index 04972c976..135437b74 100644 --- a/src/backend/langflow/routers/users.py +++ b/src/backend/langflow/routers/users.py @@ -1,4 +1,11 @@ from uuid import UUID +from langflow.services.database.models.user import ( + User, + UserAddModel, + UserListModel, + UserPatchModel, + UsersResponse, +) from sqlalchemy import func from sqlalchemy.exc import IntegrityError @@ -8,12 +15,7 @@ from fastapi import APIRouter, Depends, HTTPException from langflow.services.utils import get_session from langflow.auth.auth import get_current_active_user, get_password_hash -from langflow.database.models.user import ( - User, - UserAddModel, - UserListModel, - UserPatchModel, - UsersResponse, +from langflow.services.database.models.user import ( update_user, ) From 244a967517ec9538c252d588a746a39ce2e7745f Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 16:33:56 -0300 Subject: [PATCH 013/134] =?UTF-8?q?=F0=9F=94=A8=20refactor(service.py):=20?= =?UTF-8?q?remove=20unused=20imports=20and=20unused=20functions=20in=20the?= =?UTF-8?q?=20AuthManager=20class=20=F0=9F=94=A7=20chore(service.py):=20re?= =?UTF-8?q?factor=20the=20AuthManager=20class=20to=20accept=20a=20settings?= =?UTF-8?q?=5Fmanager=20parameter=20in=20the=20constructor=20for=20better?= =?UTF-8?q?=20dependency=20injection=20=F0=9F=94=A7=20chore(service.py):?= =?UTF-8?q?=20refactor=20the=20run=5Foauth2=5Fscheme=20method=20in=20the?= =?UTF-8?q?=20AuthManager=20class=20to=20use=20the=20oauth2=5Fscheme=20fro?= =?UTF-8?q?m=20the=20settings=5Fmanager=20instead=20of=20a=20hardcoded=20v?= =?UTF-8?q?alue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✨ feat(auth/utils.py): add authentication and authorization utilities for user authentication and token generation 🔒 chore(auth/utils.py): add auth_scheme_dependency function to handle authentication scheme dependency 🔒 chore(auth/utils.py): add get_current_user function to retrieve the current authenticated user 🔒 chore(auth/utils.py): add get_current_active_user function to retrieve the current active authenticated user 🔒 chore(auth/utils.py): add verify_password function to verify the password 🔒 chore(auth/utils.py): add get_password_hash function to get the hashed password 🔒 chore(auth/utils.py): add create_token function to create a JWT token 🔒 chore(auth/utils.py): add create_super_user function to create a super user 🔒 chore(auth/utils.py): add create_user_longterm_token function to create a long-term token for a user 🔒 chore(auth/utils.py): add create_user_api_key function to create an API key for a user 🔒 chore(auth/utils.py): add get_user_id_from_token function to get the user ID from a token 🔒 chore(auth/utils.py): add create_user_tokens function to create access and refresh tokens for a user 🔒 chore(auth/utils.py): add create_refresh_token function to create new access and refresh tokens using a refresh token 🔒 chore(auth/utils.py): add authenticate_user function to authenticate a user with username and password --- src/backend/langflow/services/auth/service.py | 227 +----------------- src/backend/langflow/services/auth/utils.py | 222 +++++++++++++++++ 2 files changed, 228 insertions(+), 221 deletions(-) create mode 100644 src/backend/langflow/services/auth/utils.py diff --git a/src/backend/langflow/services/auth/service.py b/src/backend/langflow/services/auth/service.py index 5e25aa207..c5f380298 100644 --- a/src/backend/langflow/services/auth/service.py +++ b/src/backend/langflow/services/auth/service.py @@ -1,228 +1,13 @@ -from uuid import UUID -from typing import Annotated -from jose import JWTError, jwt from langflow.services.base import Service -from langflow.services.database.models.user import ( - User, - get_user_by_id, - get_user_by_username, -) -from sqlalchemy.orm import Session -from passlib.context import CryptContext -from fastapi.security import OAuth2PasswordBearer -from fastapi import Depends, HTTPException, status -from datetime import datetime, timedelta, timezone - -from langflow.services.utils import get_settings_manager, get_session - -from langflow.services.database.models.user import ( - update_user_last_login_at, -) - - -pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") -oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login") class AuthManager(Service): name = "auth_manager" - def __init__(self): - self.pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") - self.oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login") + def __init__(self, settings_manager): + self.settings_manager = settings_manager - -async def get_current_user( - token: Annotated[str, Depends(oauth2_scheme)], db: Session = Depends(get_session) -) -> User: - settings_manager = get_settings_manager() - - credentials_exception = HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail="Could not validate credentials", - headers={"WWW-Authenticate": "Bearer"}, - ) - - try: - payload = jwt.decode( - token, - settings_manager.auth_settings.SECRET_KEY, - algorithms=[settings_manager.auth_settings.ALGORITHM], - ) - user_id: UUID = payload.get("sub") # type: ignore - token_type: str = payload.get("type") # type: ignore - - if user_id is None or token_type: - raise credentials_exception - except JWTError as e: - raise credentials_exception from e - - user = get_user_by_id(db, user_id) # type: ignore - if user is None: - raise credentials_exception - return user - - -async def get_current_active_user( - current_user: Annotated[User, Depends(get_current_user)] -): - if not current_user.is_active: - raise HTTPException(status_code=400, detail="Inactive user") - return current_user - - -def verify_password(plain_password, hashed_password): - return pwd_context.verify(plain_password, hashed_password) - - -def get_password_hash(password): - return pwd_context.hash(password) - - -def create_token(data: dict, expires_delta: timedelta): - settings_manager = get_settings_manager() - - to_encode = data.copy() - expire = datetime.now(timezone.utc) + expires_delta - to_encode["exp"] = expire - - return jwt.encode( - to_encode, - settings_manager.auth_settings.SECRET_KEY, - algorithm=settings_manager.auth_settings.ALGORITHM, - ) - - -def create_super_user(db: Session = Depends(get_session)) -> User: - settings_manager = get_settings_manager() - - super_user = get_user_by_username( - db, settings_manager.auth_settings.FIRST_SUPERUSER - ) - - if not super_user: - super_user = User( - username=settings_manager.auth_settings.FIRST_SUPERUSER, - password=get_password_hash( - settings_manager.auth_settings.FIRST_SUPERUSER_PASSWORD - ), - is_superuser=True, - is_active=True, - last_login_at=None, - ) - - db.add(super_user) - db.commit() - db.refresh(super_user) - - return super_user - - -def create_user_longterm_token(db: Session = Depends(get_session)) -> dict: - super_user = create_super_user(db) - - access_token_expires_longterm = timedelta(days=365) - access_token = create_token( - data={"sub": str(super_user.id)}, - expires_delta=access_token_expires_longterm, - ) - - # Update: last_login_at - update_user_last_login_at(super_user.id, db) - - return { - "access_token": access_token, - "refresh_token": None, - "token_type": "bearer", - } - - -def create_user_api_key(user_id: UUID) -> dict: - access_token = create_token( - data={"sub": str(user_id), "role": "api_key"}, - expires_delta=timedelta(days=365 * 2), - ) - - return {"api_key": access_token} - - -def get_user_id_from_token(token: str) -> UUID: - try: - user_id = jwt.get_unverified_claims(token)["sub"] - return UUID(user_id) - except (KeyError, JWTError, ValueError): - return UUID(int=0) - - -def create_user_tokens( - user_id: UUID, db: Session = Depends(get_session), update_last_login: bool = False -) -> dict: - settings_manager = get_settings_manager() - - access_token_expires = timedelta( - minutes=settings_manager.auth_settings.ACCESS_TOKEN_EXPIRE_MINUTES - ) - access_token = create_token( - data={"sub": str(user_id)}, - expires_delta=access_token_expires, - ) - - refresh_token_expires = timedelta( - minutes=settings_manager.auth_settings.REFRESH_TOKEN_EXPIRE_MINUTES - ) - refresh_token = create_token( - data={"sub": str(user_id), "type": "rf"}, - expires_delta=refresh_token_expires, - ) - - # Update: last_login_at - if update_last_login: - update_user_last_login_at(user_id, db) - - return { - "access_token": access_token, - "refresh_token": refresh_token, - "token_type": "bearer", - } - - -def create_refresh_token(refresh_token: str, db: Session = Depends(get_session)): - settings_manager = get_settings_manager() - - try: - payload = jwt.decode( - refresh_token, - settings_manager.auth_settings.SECRET_KEY, - algorithms=[settings_manager.auth_settings.ALGORITHM], - ) - user_id: UUID = payload.get("sub") # type: ignore - token_type: str = payload.get("type") # type: ignore - - if user_id is None or token_type is None: - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid refresh token" - ) - - return create_user_tokens(user_id, db) - - except JWTError as e: - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail="Invalid refresh token", - ) from e - - -def authenticate_user( - username: str, password: str, db: Session = Depends(get_session) -) -> User | None: - user = get_user_by_username(db, username) - - if not user: - return None - - if not user.is_active: - if not user.last_login_at: - raise HTTPException(status_code=400, detail="Waiting for approval") - raise HTTPException(status_code=400, detail="Inactive user") - - return user if verify_password(password, user.password) else None + # We need to define a function that can be passed to the Depends() function. + # This function will be called by FastAPI to run oauth2_scheme + def run_oauth2_scheme(self, *args, **kwargs): + return self.settings_manager.auth_settings.oauth2_scheme(*args, **kwargs) diff --git a/src/backend/langflow/services/auth/utils.py b/src/backend/langflow/services/auth/utils.py new file mode 100644 index 000000000..f897151e7 --- /dev/null +++ b/src/backend/langflow/services/auth/utils.py @@ -0,0 +1,222 @@ +from datetime import datetime, timedelta, timezone +from fastapi import Depends, HTTPException, status +from jose import JWTError, jwt +from typing import Annotated +from uuid import UUID +from langflow.services.auth.service import AuthManager +from langflow.services.database.models.user import ( + User, + get_user_by_id, + get_user_by_username, + update_user_last_login_at, +) +from langflow.services.utils import get_session, get_settings_manager +from sqlalchemy.orm import Session + + +def auth_scheme_dependency(*args, **kwargs): + settings_manager = ( + get_settings_manager() + ) # Assuming get_settings_manager is defined + + return AuthManager(settings_manager).run_oauth2_scheme(*args, **kwargs) + + +async def get_current_user( + token: Annotated[str, Depends(auth_scheme_dependency)], + db: Session = Depends(get_session), +) -> User: + settings_manager = get_settings_manager() + + credentials_exception = HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Could not validate credentials", + headers={"WWW-Authenticate": "Bearer"}, + ) + try: + payload = jwt.decode( + token, + settings_manager.auth_settings.SECRET_KEY, + algorithms=[settings_manager.auth_settings.ALGORITHM], + ) + user_id: UUID = payload.get("sub") # type: ignore + token_type: str = payload.get("type") # type: ignore + + if user_id is None or token_type: + raise credentials_exception + except JWTError as e: + raise credentials_exception from e + + user = get_user_by_id(db, user_id) # type: ignore + if user is None: + raise credentials_exception + return user + + +async def get_current_active_user( + current_user: Annotated[User, Depends(get_current_user)] +): + if not current_user.is_active: + raise HTTPException(status_code=400, detail="Inactive user") + return current_user + + +def verify_password(plain_password, hashed_password): + settings_manager = get_settings_manager() + return settings_manager.auth_settings.pwd_context.verify( + plain_password, hashed_password + ) + + +def get_password_hash(password): + settings_manager = get_settings_manager() + return settings_manager.auth_settings.pwd_context.hash(password) + + +def create_token(data: dict, expires_delta: timedelta): + settings_manager = get_settings_manager() + + to_encode = data.copy() + expire = datetime.now(timezone.utc) + expires_delta + to_encode["exp"] = expire + + return jwt.encode( + to_encode, + settings_manager.auth_settings.SECRET_KEY, + algorithm=settings_manager.auth_settings.ALGORITHM, + ) + + +def create_super_user(db: Session = Depends(get_session)) -> User: + settings_manager = get_settings_manager() + + super_user = get_user_by_username( + db, settings_manager.auth_settings.FIRST_SUPERUSER + ) + + if not super_user: + super_user = User( + username=settings_manager.auth_settings.FIRST_SUPERUSER, + password=get_password_hash( + settings_manager.auth_settings.FIRST_SUPERUSER_PASSWORD + ), + is_superuser=True, + is_active=True, + last_login_at=None, + ) + + db.add(super_user) + db.commit() + db.refresh(super_user) + + return super_user + + +def create_user_longterm_token(db: Session = Depends(get_session)) -> dict: + super_user = create_super_user(db) + + access_token_expires_longterm = timedelta(days=365) + access_token = create_token( + data={"sub": str(super_user.id)}, + expires_delta=access_token_expires_longterm, + ) + + # Update: last_login_at + update_user_last_login_at(super_user.id, db) + + return { + "access_token": access_token, + "refresh_token": None, + "token_type": "bearer", + } + + +def create_user_api_key(user_id: UUID) -> dict: + access_token = create_token( + data={"sub": str(user_id), "role": "api_key"}, + expires_delta=timedelta(days=365 * 2), + ) + + return {"api_key": access_token} + + +def get_user_id_from_token(token: str) -> UUID: + try: + user_id = jwt.get_unverified_claims(token)["sub"] + return UUID(user_id) + except (KeyError, JWTError, ValueError): + return UUID(int=0) + + +def create_user_tokens( + user_id: UUID, db: Session = Depends(get_session), update_last_login: bool = False +) -> dict: + settings_manager = get_settings_manager() + + access_token_expires = timedelta( + minutes=settings_manager.auth_settings.ACCESS_TOKEN_EXPIRE_MINUTES + ) + access_token = create_token( + data={"sub": str(user_id)}, + expires_delta=access_token_expires, + ) + + refresh_token_expires = timedelta( + minutes=settings_manager.auth_settings.REFRESH_TOKEN_EXPIRE_MINUTES + ) + refresh_token = create_token( + data={"sub": str(user_id), "type": "rf"}, + expires_delta=refresh_token_expires, + ) + + # Update: last_login_at + if update_last_login: + update_user_last_login_at(user_id, db) + + return { + "access_token": access_token, + "refresh_token": refresh_token, + "token_type": "bearer", + } + + +def create_refresh_token(refresh_token: str, db: Session = Depends(get_session)): + settings_manager = get_settings_manager() + + try: + payload = jwt.decode( + refresh_token, + settings_manager.auth_settings.SECRET_KEY, + algorithms=[settings_manager.auth_settings.ALGORITHM], + ) + user_id: UUID = payload.get("sub") # type: ignore + token_type: str = payload.get("type") # type: ignore + + if user_id is None or token_type is None: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid refresh token" + ) + + return create_user_tokens(user_id, db) + + except JWTError as e: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Invalid refresh token", + ) from e + + +def authenticate_user( + username: str, password: str, db: Session = Depends(get_session) +) -> User | None: + user = get_user_by_username(db, username) + + if not user: + return None + + if not user.is_active: + if not user.last_login_at: + raise HTTPException(status_code=400, detail="Waiting for approval") + raise HTTPException(status_code=400, detail="Inactive user") + + return user if verify_password(password, user.password) else None From b309d8be0ed074ef5e6e50fb8374555199e2ecd6 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 16:34:23 -0300 Subject: [PATCH 014/134] =?UTF-8?q?=F0=9F=94=92=20chore(auth.py):=20import?= =?UTF-8?q?=20necessary=20modules=20and=20add=20password=20context=20and?= =?UTF-8?q?=20OAuth2=20password=20bearer=20scheme=20for=20authentication?= =?UTF-8?q?=20=F0=9F=94=92=20chore(auth.py):=20add=20password=20context=20?= =?UTF-8?q?using=20bcrypt=20scheme=20and=20OAuth2=20password=20bearer=20sc?= =?UTF-8?q?heme=20for=20authentication?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/settings/auth.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/backend/langflow/services/settings/auth.py b/src/backend/langflow/services/settings/auth.py index d144b4347..a00ebf31e 100644 --- a/src/backend/langflow/services/settings/auth.py +++ b/src/backend/langflow/services/settings/auth.py @@ -2,6 +2,8 @@ from typing import Optional import secrets from pydantic import BaseSettings +from passlib.context import CryptContext +from fastapi.security import OAuth2PasswordBearer class AuthSettings(BaseSettings): @@ -23,6 +25,9 @@ class AuthSettings(BaseSettings): FIRST_SUPERUSER: str = "langflow" FIRST_SUPERUSER_PASSWORD: str = "langflow" + pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") + oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login") + class Config: validate_assignment = True extra = "ignore" From 181620e538cc175b80507f0c06248601722c8329 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 16:37:56 -0300 Subject: [PATCH 015/134] =?UTF-8?q?=F0=9F=94=A7=20fix(manager.py):=20impor?= =?UTF-8?q?t=20List=20from=20typing=20module=20to=20fix=20type=20hinting?= =?UTF-8?q?=20error=20=E2=9C=A8=20feat(manager.py):=20add=20support=20for?= =?UTF-8?q?=20registering=20factories=20with=20dependencies=20to=20handle?= =?UTF-8?q?=20service=20creation=20=F0=9F=94=A7=20fix(manager.py):=20fix?= =?UTF-8?q?=20service=20creation=20logic=20to=20handle=20dependencies=20an?= =?UTF-8?q?d=20create=20services=20in=20the=20correct=20order=20=E2=9C=A8?= =?UTF-8?q?=20feat(manager.py):=20add=20support=20for=20initializing=20ses?= =?UTF-8?q?sion=20manager=20with=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/manager.py | 86 +++++++++++++++++------- 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/src/backend/langflow/services/manager.py b/src/backend/langflow/services/manager.py index f05102d0e..f40ae1f25 100644 --- a/src/backend/langflow/services/manager.py +++ b/src/backend/langflow/services/manager.py @@ -1,5 +1,5 @@ from langflow.services.schema import ServiceType -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, List if TYPE_CHECKING: from langflow.services.factory import ServiceFactory @@ -13,13 +13,19 @@ class ServiceManager: def __init__(self): self.services = {} self.factories = {} + self.dependencies = {} - def register_factory(self, service_factory: "ServiceFactory"): + def register_factory( + self, service_factory: "ServiceFactory", dependencies: List[ServiceType] = None + ): """ - Registers a new factory. + Registers a new factory with dependencies. """ - if service_factory.service_class.name not in self.factories: - self.factories[service_factory.service_class.name] = service_factory + if dependencies is None: + dependencies = [] + service_name = service_factory.service_class.name + self.factories[service_name] = service_factory + self.dependencies[service_name] = dependencies def get(self, service_name: ServiceType): """ @@ -32,17 +38,25 @@ class ServiceManager: def _create_service(self, service_name: ServiceType): """ - Create a new service given its name. + Create a new service given its name, handling dependencies. """ self._validate_service_creation(service_name) - if service_name == ServiceType.SETTINGS_MANAGER: - self.services[service_name] = self.factories[service_name].create() - else: - settings_service = self.get(ServiceType.SETTINGS_MANAGER) - self.services[service_name] = self.factories[service_name].create( - settings_service - ) + # Create dependencies first + for dependency in self.dependencies.get(service_name, []): + if dependency not in self.services: + self._create_service(dependency) + + # Collect the dependent services + dependent_services = { + dep.value: self.services[dep] + for dep in self.dependencies.get(service_name, []) + } + + # Create the actual service + self.services[service_name] = self.factories[service_name].create( + **dependent_services + ) def _validate_service_creation(self, service_name: ServiceType): """ @@ -53,14 +67,6 @@ class ServiceManager: f"No factory registered for the service class '{service_name.name}'" ) - if ( - ServiceType.SETTINGS_MANAGER not in self.factories - and service_name != ServiceType.SETTINGS_MANAGER - ): - raise ValueError( - f"Cannot create service '{service_name.name}' before the settings service" - ) - def update(self, service_name: ServiceType): """ Update a service by its name. @@ -81,11 +87,26 @@ def initialize_services(): from langflow.services.cache import factory as cache_factory from langflow.services.chat import factory as chat_factory from langflow.services.settings import factory as settings_factory + from langflow.services.session import factory as session_manager_factory service_manager.register_factory(settings_factory.SettingsManagerFactory()) - service_manager.register_factory(database_factory.DatabaseManagerFactory()) - service_manager.register_factory(cache_factory.CacheManagerFactory()) + service_manager.register_factory( + database_factory.DatabaseManagerFactory(), + dependencies=[ServiceType.SETTINGS_MANAGER], + ) + service_manager.register_factory( + cache_factory.CacheManagerFactory(), dependencies=[ServiceType.SETTINGS_MANAGER] + ) service_manager.register_factory(chat_factory.ChatManagerFactory()) + service_manager.register_factory( + session_manager_factory.SessionManagerFactory(), + dependencies=[ServiceType.CACHE_MANAGER], + ) + + # Test cache connection + service_manager.get(ServiceType.CACHE_MANAGER) + # Test database connection + service_manager.get(ServiceType.DATABASE_MANAGER) def initialize_settings_manager(): @@ -95,3 +116,22 @@ def initialize_settings_manager(): from langflow.services.settings import factory as settings_factory service_manager.register_factory(settings_factory.SettingsManagerFactory()) + + +def initialize_session_manager(): + """ + Initialize the session manager. + """ + from langflow.services.session import factory as session_manager_factory + from langflow.services.cache import factory as cache_factory + + initialize_settings_manager() + + service_manager.register_factory( + cache_factory.CacheManagerFactory(), dependencies=[ServiceType.SETTINGS_MANAGER] + ) + + service_manager.register_factory( + session_manager_factory.SessionManagerFactory(), + dependencies=[ServiceType.CACHE_MANAGER], + ) From fa9ecd003921b7c35d7f2a79e2c2d1f0dce5a07e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 16:55:45 -0300 Subject: [PATCH 016/134] =?UTF-8?q?=F0=9F=9A=80=20feat(models/=5F=5Finit?= =?UTF-8?q?=5F=5F.py):=20add=20User=20and=20Token=20models=20to=20=5F=5Fal?= =?UTF-8?q?l=5F=5F=20list=20for=20better=20module=20importability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/database/models/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/services/database/models/__init__.py b/src/backend/langflow/services/database/models/__init__.py index da47bc5fe..28d2b4af8 100644 --- a/src/backend/langflow/services/database/models/__init__.py +++ b/src/backend/langflow/services/database/models/__init__.py @@ -1,4 +1,5 @@ from .flow import Flow +from .user import User +from .token import Token - -__all__ = ["Flow"] +__all__ = ["Flow", "User", "Token"] From 712d57be53964fba8c3762e5920a7801d8c251b7 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 16:56:07 -0300 Subject: [PATCH 017/134] =?UTF-8?q?=F0=9F=94=84=20refactor(factory.py):=20?= =?UTF-8?q?rename=20settings=5Fservice=20parameter=20to=20settings=5Fmanag?= =?UTF-8?q?er=20for=20better=20clarity=20and=20consistency=20=F0=9F=90=9B?= =?UTF-8?q?=20fix(factory.py):=20update=20variable=20name=20in=20if=20cond?= =?UTF-8?q?ition=20from=20settings=5Fservice.settings.DATABASE=5FURL=20to?= =?UTF-8?q?=20settings=5Fmanager.settings.DATABASE=5FURL=20to=20fix=20inco?= =?UTF-8?q?rrect=20variable=20reference?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/database/factory.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/langflow/services/database/factory.py b/src/backend/langflow/services/database/factory.py index fecf24543..25427b7b9 100644 --- a/src/backend/langflow/services/database/factory.py +++ b/src/backend/langflow/services/database/factory.py @@ -10,8 +10,8 @@ class DatabaseManagerFactory(ServiceFactory): def __init__(self): super().__init__(DatabaseManager) - def create(self, settings_service: "SettingsManager"): + def create(self, settings_manager: "SettingsManager"): # Here you would have logic to create and configure a DatabaseManager - if not settings_service.settings.DATABASE_URL: + if not settings_manager.settings.DATABASE_URL: raise ValueError("No database URL provided") - return DatabaseManager(settings_service.settings.DATABASE_URL) + return DatabaseManager(settings_manager.settings.DATABASE_URL) From 5d9e631ddf81adb6f0030b9e27e8e99e5418b462 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 16:56:20 -0300 Subject: [PATCH 018/134] =?UTF-8?q?=F0=9F=94=A8=20refactor(factory.py):=20?= =?UTF-8?q?remove=20unused=20parameter=20'settings=5Fservice'=20from=20cre?= =?UTF-8?q?ate=20method=20in=20CacheManagerFactory=20class?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/cache/factory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/langflow/services/cache/factory.py b/src/backend/langflow/services/cache/factory.py index 77f8d58d1..f180f67c0 100644 --- a/src/backend/langflow/services/cache/factory.py +++ b/src/backend/langflow/services/cache/factory.py @@ -6,6 +6,6 @@ class CacheManagerFactory(ServiceFactory): def __init__(self): super().__init__(CacheManager) - def create(self, settings_service): + def create(self): # Here you would have logic to create and configure a CacheManager return CacheManager() From 031ab7e4b7fae2f21da00c5fd985d55ad02e16b1 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 16:58:09 -0300 Subject: [PATCH 019/134] =?UTF-8?q?=F0=9F=93=A6=20chore(factory.py):=20add?= =?UTF-8?q?=20AuthManagerFactory=20class=20to=20handle=20creation=20of=20A?= =?UTF-8?q?uthManager=20service=20=F0=9F=90=9B=20fix(service.py):=20add=20?= =?UTF-8?q?type=20hints=20and=20import=20for=20SettingsManager=20in=20Auth?= =?UTF-8?q?Manager=20class?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/auth/factory.py | 12 ++++++++++++ src/backend/langflow/services/auth/service.py | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/services/auth/factory.py b/src/backend/langflow/services/auth/factory.py index e69de29bb..4914ce645 100644 --- a/src/backend/langflow/services/auth/factory.py +++ b/src/backend/langflow/services/auth/factory.py @@ -0,0 +1,12 @@ +from langflow.services.factory import ServiceFactory +from langflow.services.auth.service import AuthManager + + +class AuthManagerFactory(ServiceFactory): + name = "auth_manager" + + def __init__(self): + super().__init__(AuthManager) + + def create(self, settings_manager): + return AuthManager(settings_manager) diff --git a/src/backend/langflow/services/auth/service.py b/src/backend/langflow/services/auth/service.py index c5f380298..57c586c94 100644 --- a/src/backend/langflow/services/auth/service.py +++ b/src/backend/langflow/services/auth/service.py @@ -1,10 +1,14 @@ from langflow.services.base import Service +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from langflow.services.settings.manager import SettingsManager class AuthManager(Service): name = "auth_manager" - def __init__(self, settings_manager): + def __init__(self, settings_manager: "SettingsManager"): self.settings_manager = settings_manager # We need to define a function that can be passed to the Depends() function. From 0a235ef8d553279e3ad731d3f88a3839b6837fec Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 16:58:22 -0300 Subject: [PATCH 020/134] =?UTF-8?q?=F0=9F=94=80=20refactor(manager.py):=20?= =?UTF-8?q?refactor=20service=20initialization=20in=20manager.py=20for=20b?= =?UTF-8?q?etter=20organization=20and=20readability=20=F0=9F=94=80=20refac?= =?UTF-8?q?tor(schema.py):=20add=20AUTH=5FMANAGER=20service=20type=20to=20?= =?UTF-8?q?the=20ServiceType=20enum=20for=20better=20organization=20and=20?= =?UTF-8?q?consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/manager.py | 13 +++++-------- src/backend/langflow/services/schema.py | 1 + 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/backend/langflow/services/manager.py b/src/backend/langflow/services/manager.py index f40ae1f25..1592e7612 100644 --- a/src/backend/langflow/services/manager.py +++ b/src/backend/langflow/services/manager.py @@ -87,21 +87,18 @@ def initialize_services(): from langflow.services.cache import factory as cache_factory from langflow.services.chat import factory as chat_factory from langflow.services.settings import factory as settings_factory - from langflow.services.session import factory as session_manager_factory + from langflow.services.auth import factory as auth_factory service_manager.register_factory(settings_factory.SettingsManagerFactory()) + service_manager.register_factory( + auth_factory.AuthManagerFactory(), dependencies=[ServiceType.SETTINGS_MANAGER] + ) service_manager.register_factory( database_factory.DatabaseManagerFactory(), dependencies=[ServiceType.SETTINGS_MANAGER], ) - service_manager.register_factory( - cache_factory.CacheManagerFactory(), dependencies=[ServiceType.SETTINGS_MANAGER] - ) + service_manager.register_factory(cache_factory.CacheManagerFactory()) service_manager.register_factory(chat_factory.ChatManagerFactory()) - service_manager.register_factory( - session_manager_factory.SessionManagerFactory(), - dependencies=[ServiceType.CACHE_MANAGER], - ) # Test cache connection service_manager.get(ServiceType.CACHE_MANAGER) diff --git a/src/backend/langflow/services/schema.py b/src/backend/langflow/services/schema.py index 695763afc..6291a0d0b 100644 --- a/src/backend/langflow/services/schema.py +++ b/src/backend/langflow/services/schema.py @@ -7,6 +7,7 @@ class ServiceType(str, Enum): registered with the service manager. """ + AUTH_MANAGER = "auth_manager" CACHE_MANAGER = "cache_manager" SETTINGS_MANAGER = "settings_manager" DATABASE_MANAGER = "database_manager" From 48965a8ba8b6622792503e3a67e8029866715de2 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 21 Aug 2023 19:14:58 -0300 Subject: [PATCH 021/134] =?UTF-8?q?=F0=9F=90=9B=20fix(endpoints.py):=20add?= =?UTF-8?q?=20check=20for=20empty=20custom=5Fcomponent=5Fdict=20to=20preve?= =?UTF-8?q?nt=20errors=20=F0=9F=90=9B=20fix(login.py):=20update=20import?= =?UTF-8?q?=20statement=20for=20auth=20utils=20module=20=F0=9F=90=9B=20fix?= =?UTF-8?q?(users.py):=20update=20import=20statement=20for=20auth=20utils?= =?UTF-8?q?=20module=20=F0=9F=90=9B=20fix(factory.py):=20remove=20unnecess?= =?UTF-8?q?ary=20argument=20from=20create=20method=20=F0=9F=90=9B=20fix(te?= =?UTF-8?q?st=5Fcli.py):=20convert=20temp=5Fdir=20to=20string=20before=20c?= =?UTF-8?q?hecking=20if=20it's=20in=20COMPONENTS=5FPATH?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/endpoints.py | 2 ++ src/backend/langflow/routers/login.py | 2 +- src/backend/langflow/routers/users.py | 2 +- src/backend/langflow/services/chat/factory.py | 2 +- tests/test_cli.py | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/backend/langflow/api/v1/endpoints.py b/src/backend/langflow/api/v1/endpoints.py index 928d6609c..221091b7f 100644 --- a/src/backend/langflow/api/v1/endpoints.py +++ b/src/backend/langflow/api/v1/endpoints.py @@ -59,6 +59,8 @@ def get_all(): logger.info(f"Loading {len(custom_component_dicts)} category(ies)") for custom_component_dict in custom_component_dicts: # custom_component_dict is a dict of dicts + if not custom_component_dict: + continue category = list(custom_component_dict.keys())[0] logger.info( f"Loading {len(custom_component_dict[category])} component(s) from category {category}" diff --git a/src/backend/langflow/routers/login.py b/src/backend/langflow/routers/login.py index 6a103d646..b559b0a23 100644 --- a/src/backend/langflow/routers/login.py +++ b/src/backend/langflow/routers/login.py @@ -4,7 +4,7 @@ from fastapi.security import OAuth2PasswordRequestForm from langflow.services.utils import get_session from langflow.services.database.models import Token -from langflow.auth.auth import ( +from langflow.services.auth.utils import ( authenticate_user, create_user_tokens, create_refresh_token, diff --git a/src/backend/langflow/routers/users.py b/src/backend/langflow/routers/users.py index 135437b74..2a944cb64 100644 --- a/src/backend/langflow/routers/users.py +++ b/src/backend/langflow/routers/users.py @@ -14,7 +14,7 @@ from sqlmodel import Session, select from fastapi import APIRouter, Depends, HTTPException from langflow.services.utils import get_session -from langflow.auth.auth import get_current_active_user, get_password_hash +from langflow.services.auth.utils import get_current_active_user, get_password_hash from langflow.services.database.models.user import ( update_user, ) diff --git a/src/backend/langflow/services/chat/factory.py b/src/backend/langflow/services/chat/factory.py index 03597ed11..ca844893a 100644 --- a/src/backend/langflow/services/chat/factory.py +++ b/src/backend/langflow/services/chat/factory.py @@ -6,6 +6,6 @@ class ChatManagerFactory(ServiceFactory): def __init__(self): super().__init__(ChatManager) - def create(self, settings_service): + def create(self): # Here you would have logic to create and configure a ChatManager return ChatManager() diff --git a/tests/test_cli.py b/tests/test_cli.py index 408500d7a..c990ef9e8 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -27,4 +27,4 @@ def test_components_path(runner, client, default_settings): ) assert result.exit_code == 0, result.stdout settings_manager = utils.get_settings_manager() - assert temp_dir in settings_manager.settings.COMPONENTS_PATH + assert str(temp_dir) in settings_manager.settings.COMPONENTS_PATH From 022b6e1170efdeba38d54fca21c4cc7874e8bda7 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 09:50:09 -0300 Subject: [PATCH 022/134] =?UTF-8?q?=F0=9F=94=BA=20chore(package.json):=20u?= =?UTF-8?q?pdate=20"@mendable/search"=20dependency=20from=20"^0.0.114"=20t?= =?UTF-8?q?o=20"^0.0.154"=20to=20get=20the=20latest=20features=20and=20bug?= =?UTF-8?q?=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/package-lock.json | 71 +++++++++++++++++++++++++++++++++++++++--- docs/package.json | 4 +-- 2 files changed, 69 insertions(+), 6 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index ed79230c6..c0c8a73fd 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -16,7 +16,7 @@ "@docusaurus/theme-classic": "^2.4.1", "@docusaurus/theme-search-algolia": "^2.4.1", "@mdx-js/react": "^2.3.0", - "@mendable/search": "^0.0.114", + "@mendable/search": "^0.0.154", "@pbe/react-yandex-maps": "^1.2.4", "@prismicio/client": "^7.0.1", "@uiball/loaders": "^1.2.6", @@ -3250,10 +3250,11 @@ } }, "node_modules/@mendable/search": { - "version": "0.0.114", - "resolved": "https://registry.npmjs.org/@mendable/search/-/search-0.0.114.tgz", - "integrity": "sha512-0uR+zxONuu/16bpLli49Jocr5fee1WIjs06KzU1AnHsR+fdFBmfrlpgTDWctgGuXPzS5Dorlw4VMlR5dPW5qVQ==", + "version": "0.0.154", + "resolved": "https://registry.npmjs.org/@mendable/search/-/search-0.0.154.tgz", + "integrity": "sha512-adNwXlIaMXVMCkPU2uUdghfn05Dmxb0BnE95SRLQJ6evHajsNFQdRl5Ltj3WijG+qo4ozTIJcPOBYrDPKMTPVw==", "dependencies": { + "html-react-parser": "^4.2.0", "posthog-js": "^1.45.1" }, "peerDependencies": { @@ -9351,6 +9352,33 @@ "safe-buffer": "~5.1.0" } }, + "node_modules/html-dom-parser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-4.0.0.tgz", + "integrity": "sha512-TUa3wIwi80f5NF8CVWzkopBVqVAtlawUzJoLwVLHns0XSJGynss4jiY0mTWpiDOsuyw+afP+ujjMgRh9CoZcXw==", + "dependencies": { + "domhandler": "5.0.3", + "htmlparser2": "9.0.0" + } + }, + "node_modules/html-dom-parser/node_modules/htmlparser2": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.0.0.tgz", + "integrity": "sha512-uxbSI98wmFT/G4P2zXx4OVx04qWUmyFPrD2/CNepa2Zo3GPNaCaaxElDgwUrwYWkK1nr9fft0Ya8dws8coDLLQ==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "entities": "^4.5.0" + } + }, "node_modules/html-entities": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", @@ -9394,6 +9422,20 @@ "node": ">= 12" } }, + "node_modules/html-react-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/html-react-parser/-/html-react-parser-4.2.1.tgz", + "integrity": "sha512-Dxzdowj5Zu/+7mr8X8PzCFbPXGuwCwGB2u4cB6oxZGES9inw85qlvnlfPD75VGKUGjcgsXs+9Dpj+THWNQyOBw==", + "dependencies": { + "domhandler": "5.0.3", + "html-dom-parser": "4.0.0", + "react-property": "2.0.0", + "style-to-js": "1.1.3" + }, + "peerDependencies": { + "react": "0.14 || 15 || 16 || 17 || 18" + } + }, "node_modules/html-tags": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", @@ -15324,6 +15366,11 @@ "react": ">=16.6.0" } }, + "node_modules/react-property": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/react-property/-/react-property-2.0.0.tgz", + "integrity": "sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw==" + }, "node_modules/react-router": { "version": "5.3.4", "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz", @@ -17510,6 +17557,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/style-to-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.3.tgz", + "integrity": "sha512-zKI5gN/zb7LS/Vm0eUwjmjrXWw8IMtyA8aPBJZdYiQTXj4+wQ3IucOLIOnF7zCHxvW8UhIGh/uZh/t9zEHXNTQ==", + "dependencies": { + "style-to-object": "0.4.1" + } + }, + "node_modules/style-to-js/node_modules/style-to-object": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.1.tgz", + "integrity": "sha512-HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw==", + "dependencies": { + "inline-style-parser": "0.1.1" + } + }, "node_modules/style-to-object": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz", diff --git a/docs/package.json b/docs/package.json index 856e66ebe..277f959a8 100644 --- a/docs/package.json +++ b/docs/package.json @@ -22,7 +22,7 @@ "@docusaurus/theme-classic": "^2.4.1", "@docusaurus/theme-search-algolia": "^2.4.1", "@mdx-js/react": "^2.3.0", - "@mendable/search": "^0.0.114", + "@mendable/search": "^0.0.154", "@pbe/react-yandex-maps": "^1.2.4", "@prismicio/client": "^7.0.1", "@uiball/loaders": "^1.2.6", @@ -69,4 +69,4 @@ "engines": { "node": ">=16.14" } -} +} \ No newline at end of file From f01658d521addb5c3f66ccd4b270814bb8e1da9e Mon Sep 17 00:00:00 2001 From: DiogenesBR Date: Tue, 22 Aug 2023 13:37:34 +0000 Subject: [PATCH 023/134] added client_settings tho the returned Chroma object --- .devcontainer/devcontainer.json | 3 +- .gitattributes | 1 + docker-compose.debug.yml | 66 +++++++++---------- .../components/vectorstores/Chroma.py | 2 +- 4 files changed, 37 insertions(+), 35 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index aed1ec954..5b8cab4c4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -30,7 +30,8 @@ "sourcery.sourcery", "eamodio.gitlens", "ms-vscode.makefile-tools", - "GitHub.vscode-pull-request-github" + "GitHub.vscode-pull-request-github", + "ms-azuretools.vscode-docker" ]} } diff --git a/.gitattributes b/.gitattributes index 5957bfeff..aa545d82f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,6 +16,7 @@ *.yml text *.yaml text *.Dockerfile text +Dockerfile text # Declare files that will always have CRLF line endings on checkout. *.sln text eol=crlf diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml index 6a9802e38..c73ff2a60 100644 --- a/docker-compose.debug.yml +++ b/docker-compose.debug.yml @@ -1,33 +1,33 @@ -version: "3.4" - -services: - backend: - volumes: - - ./:/app - build: - context: ./ - dockerfile: ./dev.Dockerfile - command: - [ - "sh", - "-c", - "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m uvicorn --factory src.backend.langflow.main:create_app --host 0.0.0.0 --port 7860 --reload", - ] - ports: - - 7860:7860 - - 5678:5678 - restart: on-failure - - frontend: - build: - context: ./src/frontend - dockerfile: ./dev.Dockerfile - args: - - BACKEND_URL=http://backend:7860 - ports: - - "3000:3000" - volumes: - - ./src/frontend/public:/home/node/app/public - - ./src/frontend/src:/home/node/app/src - - ./src/frontend/package.json:/home/node/app/package.json - restart: on-failure +version: "3.4" + +services: + backend: + volumes: + - ./:/app + build: + context: ./ + dockerfile: ./dev.Dockerfile + command: + [ + "sh", + "-c", + "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m uvicorn --factory src.backend.langflow.main:create_app --host 0.0.0.0 --port 7860 --reload", + ] + ports: + - 7860:7860 + - 5678:5678 + restart: on-failure + + frontend: + build: + context: ./src/frontend + dockerfile: ./dev.Dockerfile + args: + - BACKEND_URL=http://backend:7860 + ports: + - "3000:3000" + volumes: + - ./src/frontend/public:/home/node/app/public + - ./src/frontend/src:/home/node/app/src + - ./src/frontend/package.json:/home/node/app/package.json + restart: on-failure diff --git a/src/backend/langflow/components/vectorstores/Chroma.py b/src/backend/langflow/components/vectorstores/Chroma.py index 38e675d9d..94d123fb4 100644 --- a/src/backend/langflow/components/vectorstores/Chroma.py +++ b/src/backend/langflow/components/vectorstores/Chroma.py @@ -105,5 +105,5 @@ class ChromaComponent(CustomComponent): ) return Chroma( - persist_directory=persist_directory, + persist_directory=persist_directory, client_settings=chroma_settings ) From d0aa3261f134eabbcf0ce4046ba127db67305b62 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 11:04:41 -0300 Subject: [PATCH 024/134] =?UTF-8?q?=F0=9F=90=9B=20fix(flows.py):=20change?= =?UTF-8?q?=20json.loads=20to=20orjson.loads=20for=20improved=20performanc?= =?UTF-8?q?e=20and=20compatibility=20with=20orjson=20library=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(schemas.py):=20change=20json.dumps=20to=20or?= =?UTF-8?q?json=5Fdumps=20for=20improved=20performance=20and=20compatibili?= =?UTF-8?q?ty=20with=20orjson=20library=20=F0=9F=90=9B=20fix(utils.py):=20?= =?UTF-8?q?change=20json.loads=20to=20orjson.loads=20for=20improved=20perf?= =?UTF-8?q?ormance=20and=20compatibility=20with=20orjson=20library=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(loading.py):=20change=20json.loads=20to=20or?= =?UTF-8?q?json.loads=20for=20improved=20performance=20and=20compatibility?= =?UTF-8?q?=20with=20orjson=20library=20=F0=9F=90=9B=20fix(utils.py):=20ch?= =?UTF-8?q?ange=20json.loads=20to=20orjson.loads=20for=20improved=20perfor?= =?UTF-8?q?mance=20and=20compatibility=20with=20orjson=20library=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(vector=5Fstore.py):=20change=20json.loads=20?= =?UTF-8?q?to=20orjson.loads=20for=20improved=20performance=20and=20compat?= =?UTF-8?q?ibility=20with=20orjson=20library=20=F0=9F=90=9B=20fix(types.py?= =?UTF-8?q?):=20change=20json.loads=20to=20orjson.loads=20for=20improved?= =?UTF-8?q?=20performance=20and=20compatibility=20with=20orjson=20library?= =?UTF-8?q?=20=F0=9F=90=9B=20fix(process.py):=20change=20json.loads=20to?= =?UTF-8?q?=20orjson.loads=20for=20improved=20performance=20and=20compatib?= =?UTF-8?q?ility=20with=20orjson=20library=20=E2=9C=A8=20feat(server.ts):?= =?UTF-8?q?=20change=20port=20variable=20case=20from=20lowercase=20port=20?= =?UTF-8?q?to=20uppercase=20PORT=20to=20improve=20semantics=20=E2=9C=A8=20?= =?UTF-8?q?feat(server.ts):=20add=20support=20for=20process.env.PORT=20env?= =?UTF-8?q?ironment=20variable=20to=20be=20able=20to=20run=20app=20on=20a?= =?UTF-8?q?=20configurable=20port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔧 fix(base.py): import orjson instead of json to improve performance and compatibility 🔧 fix(frontend_node/llms.py): use orjson_dumps instead of json.dumps to improve performance and compatibility 🔧 fix(frontend_node/utilities.py): use orjson_dumps instead of json.dumps to improve performance and compatibility 🔧 fix(test_cache.py): import orjson and use orjson_dumps instead of json.dumps to improve performance and compatibility 🔧 fix(test_database.py): import correct json encoder and decoder functions to fix import errors 🔧 fix(test_database.py): replace json.dumps and json.loads with orjson_dumps and orjson.loads for better performance and compatibility 🔧 fix(test_loading.py): remove unused import statement --- src/backend/langflow/api/v1/flows.py | 6 +- src/backend/langflow/api/v1/schemas.py | 4 +- src/backend/langflow/cache/utils.py | 5 +- src/backend/langflow/chat/manager.py | 3 +- src/backend/langflow/database/models/base.py | 17 +- .../langflow/interface/agents/prebuilt.py | 3 +- .../langflow/interface/initialize/loading.py | 6 +- .../langflow/interface/initialize/utils.py | 6 +- .../interface/initialize/vector_store.py | 3 +- src/backend/langflow/interface/types.py | 21 +- src/backend/langflow/processing/process.py | 2 +- .../langflow/services/settings/base.py | 222 ++++++++++++++++++ src/backend/langflow/settings.py | 4 +- .../langflow/template/frontend_node/llms.py | 4 +- .../template/frontend_node/utilities.py | 4 +- tests/test_cache.py | 6 +- tests/test_database.py | 29 +-- tests/test_loading.py | 1 - 18 files changed, 291 insertions(+), 55 deletions(-) create mode 100644 src/backend/langflow/services/settings/base.py diff --git a/src/backend/langflow/api/v1/flows.py b/src/backend/langflow/api/v1/flows.py index 9f5042fcb..2ff57f4ef 100644 --- a/src/backend/langflow/api/v1/flows.py +++ b/src/backend/langflow/api/v1/flows.py @@ -1,5 +1,6 @@ from typing import List from uuid import UUID +from fastapi.encoders import jsonable_encoder from langflow.settings import settings from langflow.api.utils import remove_api_keys from langflow.api.v1.schemas import FlowListCreate, FlowListRead @@ -11,12 +12,11 @@ from langflow.database.models.flow import ( FlowUpdate, ) from langflow.database.base import get_session +import orjson from sqlmodel import Session, select from fastapi import APIRouter, Depends, HTTPException -from fastapi.encoders import jsonable_encoder from fastapi import File, UploadFile -import json # build router router = APIRouter(prefix="/flows", tags=["Flows"]) @@ -105,7 +105,7 @@ async def upload_file( ): """Upload flows from a file.""" contents = await file.read() - data = json.loads(contents) + data = orjson.loads(contents) if "flows" in data: flow_list = FlowListCreate(**data) else: diff --git a/src/backend/langflow/api/v1/schemas.py b/src/backend/langflow/api/v1/schemas.py index 0148dac6d..bbff0de4a 100644 --- a/src/backend/langflow/api/v1/schemas.py +++ b/src/backend/langflow/api/v1/schemas.py @@ -1,9 +1,9 @@ from enum import Enum from pathlib import Path from typing import Any, Dict, List, Optional, Union +from langflow.database.models.base import orjson_dumps from langflow.database.models.flow import FlowCreate, FlowRead from pydantic import BaseModel, Field, validator -import json class BuildStatus(Enum): @@ -115,7 +115,7 @@ class StreamData(BaseModel): data: dict def __str__(self) -> str: - return f"event: {self.event}\ndata: {json.dumps(self.data)}\n\n" + return f"event: {self.event}\ndata: {orjson_dumps(self.data)}\n\n" class CustomComponentCode(BaseModel): diff --git a/src/backend/langflow/cache/utils.py b/src/backend/langflow/cache/utils.py index 3deabe9f4..cd282d2e9 100644 --- a/src/backend/langflow/cache/utils.py +++ b/src/backend/langflow/cache/utils.py @@ -2,13 +2,13 @@ import base64 import contextlib import functools import hashlib -import json import os import tempfile from collections import OrderedDict from pathlib import Path from typing import Any, Dict from appdirs import user_cache_dir +from langflow.database.models.base import orjson_dumps CACHE: Dict[str, Any] = {} @@ -76,7 +76,8 @@ def clear_old_cache_files(max_cache_size: int = 3): def compute_dict_hash(graph_data): graph_data = filter_json(graph_data) - cleaned_graph_json = json.dumps(graph_data, sort_keys=True) + cleaned_graph_json = orjson_dumps(graph_data, sort_keys=True) + return hashlib.sha256(cleaned_graph_json.encode("utf-8")).hexdigest() diff --git a/src/backend/langflow/chat/manager.py b/src/backend/langflow/chat/manager.py index 2c3427a12..24e2212b8 100644 --- a/src/backend/langflow/chat/manager.py +++ b/src/backend/langflow/chat/manager.py @@ -9,7 +9,6 @@ from langflow.utils.logger import logger import asyncio -import json from typing import Any, Dict, List from langflow.cache.flow import InMemoryCache @@ -186,7 +185,7 @@ class ChatManager: while True: json_payload = await websocket.receive_json() try: - payload = json.loads(json_payload) + payload = orjson.loads(json_payload) except TypeError: payload = json_payload if "clear_history" in payload: diff --git a/src/backend/langflow/database/models/base.py b/src/backend/langflow/database/models/base.py index e20895b93..a70999206 100644 --- a/src/backend/langflow/database/models/base.py +++ b/src/backend/langflow/database/models/base.py @@ -2,9 +2,20 @@ from sqlmodel import SQLModel import orjson -def orjson_dumps(v, *, default): - # orjson.dumps returns bytes, to match standard json.dumps we need to decode - return orjson.dumps(v, default=default).decode() +def orjson_dumps(v, *, default=None, sort_keys=False, indent_2=True): + option = orjson.OPT_SORT_KEYS if sort_keys else None + if indent_2: + # orjson.dumps returns bytes, to match standard json.dumps we need to decode + # option + # To modify how data is serialized, specify option. Each option is an integer constant in orjson. + # To specify multiple options, mask them together, e.g., option=orjson.OPT_STRICT_INTEGER | orjson.OPT_NAIVE_UTC + if option is None: + option = orjson.OPT_INDENT_2 + else: + option |= orjson.OPT_INDENT_2 + if default is None: + return orjson.dumps(v, option=option).decode() + return orjson.dumps(v, default=default, option=option).decode() class SQLModelSerializable(SQLModel): diff --git a/src/backend/langflow/interface/agents/prebuilt.py b/src/backend/langflow/interface/agents/prebuilt.py index 5b81b7713..1c62918d9 100644 --- a/src/backend/langflow/interface/agents/prebuilt.py +++ b/src/backend/langflow/interface/agents/prebuilt.py @@ -1,7 +1,6 @@ from langchain import LLMChain from langchain.agents import AgentExecutor, ZeroShotAgent -from langchain.agents.agent_toolkits.json.prompt import JSON_PREFIX, JSON_SUFFIX -from langchain.agents.agent_toolkits.json.toolkit import JsonToolkit +from langchain.agents.agent_toolkits.json.prompt import JSON_SUFFIX from langchain.agents.mrkl.prompt import FORMAT_INSTRUCTIONS from langchain.base_language import BaseLanguageModel diff --git a/src/backend/langflow/interface/initialize/loading.py b/src/backend/langflow/interface/initialize/loading.py index dc8188ea5..6cb565e61 100644 --- a/src/backend/langflow/interface/initialize/loading.py +++ b/src/backend/langflow/interface/initialize/loading.py @@ -1,4 +1,4 @@ -import json +import orjson from typing import Any, Callable, Dict, Sequence, Type from langchain.agents import agent as agent_module @@ -66,7 +66,7 @@ def convert_kwargs(params): for key in kwargs_keys: if isinstance(params[key], str): try: - params[key] = json.loads(params[key]) + params[key] = orjson.loads(params[key]) except json.JSONDecodeError: # if the string is not a valid json string, we will # remove the key from the params @@ -306,7 +306,7 @@ def instantiate_documentloader(class_object: Type[BaseLoader], params: Dict): metadata = params.pop("metadata", None) if metadata and isinstance(metadata, str): try: - metadata = json.loads(metadata) + metadata = orjson.loads(metadata) except json.JSONDecodeError as exc: raise ValueError( "The metadata you provided is not a valid JSON string." diff --git a/src/backend/langflow/interface/initialize/utils.py b/src/backend/langflow/interface/initialize/utils.py index ceb8a53a1..116673645 100644 --- a/src/backend/langflow/interface/initialize/utils.py +++ b/src/backend/langflow/interface/initialize/utils.py @@ -1,5 +1,7 @@ import contextlib import json +from langflow.database.models.base import orjson_dumps +import orjson from typing import Any, Dict, List from langchain.agents import ZeroShotAgent @@ -95,9 +97,11 @@ def format_content(variable): def try_to_load_json(content): with contextlib.suppress(json.JSONDecodeError): - content = json.loads(content) + content = orjson.loads(content) if isinstance(content, list): content = ",".join([str(item) for item in content]) + else: + content = orjson_dumps(content) return content diff --git a/src/backend/langflow/interface/initialize/vector_store.py b/src/backend/langflow/interface/initialize/vector_store.py index 1bc2d73e0..c8d8f0b02 100644 --- a/src/backend/langflow/interface/initialize/vector_store.py +++ b/src/backend/langflow/interface/initialize/vector_store.py @@ -1,4 +1,3 @@ -import json from typing import Any, Callable, Dict, Type from langchain.vectorstores import ( Pinecone, @@ -92,7 +91,7 @@ def initialize_weaviate(class_object: Type[Weaviate], params: dict): import weaviate # type: ignore client_kwargs_json = params.get("client_kwargs", "{}") - client_kwargs = json.loads(client_kwargs_json) + client_kwargs = orjson.loads(client_kwargs_json) client_params = { "url": params.get("weaviate_url"), } diff --git a/src/backend/langflow/interface/types.py b/src/backend/langflow/interface/types.py index 885e33694..bbdcb4461 100644 --- a/src/backend/langflow/interface/types.py +++ b/src/backend/langflow/interface/types.py @@ -190,17 +190,16 @@ def build_frontend_node(custom_component: CustomComponent): def update_attributes(frontend_node, template_config): """Update the display name and description of a frontend node""" - if "display_name" in template_config: - frontend_node["display_name"] = template_config["display_name"] - - if "description" in template_config: - frontend_node["description"] = template_config["description"] - - if "beta" in template_config: - frontend_node["beta"] = template_config["beta"] - - if "documentation" in template_config: - frontend_node["documentation"] = template_config["documentation"] + attributes = [ + "display_name", + "description", + "beta", + "documentation", + "output_types", + ] + for attribute in attributes: + if attribute in template_config: + frontend_node[attribute] = template_config[attribute] def build_field_config(custom_component: CustomComponent): diff --git a/src/backend/langflow/processing/process.py b/src/backend/langflow/processing/process.py index 8cefb1f44..6d62cdd68 100644 --- a/src/backend/langflow/processing/process.py +++ b/src/backend/langflow/processing/process.py @@ -1,6 +1,6 @@ +import json from pathlib import Path from langchain.schema import AgentAction -import json from langflow.interface.run import ( build_sorted_vertices_with_caching, get_memory_key, diff --git a/src/backend/langflow/services/settings/base.py b/src/backend/langflow/services/settings/base.py new file mode 100644 index 000000000..c8e4ec380 --- /dev/null +++ b/src/backend/langflow/services/settings/base.py @@ -0,0 +1,222 @@ +import contextlib +import orjson +import os +from shutil import copy2 +from typing import Optional, List +from pathlib import Path + +import yaml +from pydantic import BaseSettings, root_validator, validator +from langflow.utils.logger import logger + +# BASE_COMPONENTS_PATH = str(Path(__file__).parent / "components") +BASE_COMPONENTS_PATH = str(Path(__file__).parent.parent.parent / "components") + + +class Settings(BaseSettings): + CHAINS: dict = {} + AGENTS: dict = {} + PROMPTS: dict = {} + LLMS: dict = {} + TOOLS: dict = {} + MEMORIES: dict = {} + EMBEDDINGS: dict = {} + VECTORSTORES: dict = {} + DOCUMENTLOADERS: dict = {} + WRAPPERS: dict = {} + RETRIEVERS: dict = {} + TOOLKITS: dict = {} + TEXTSPLITTERS: dict = {} + UTILITIES: dict = {} + OUTPUT_PARSERS: dict = {} + CUSTOM_COMPONENTS: dict = {} + + # Define the default LANGFLOW_DIR + CONFIG_DIR: Optional[str] = None + + DEV: bool = False + DATABASE_URL: Optional[str] = None + CACHE: str = "InMemoryCache" + REMOVE_API_KEYS: bool = False + COMPONENTS_PATH: List[str] = [] + + @validator("CONFIG_DIR", pre=True, allow_reuse=True) + def set_langflow_dir(cls, value): + if not value: + import appdirs + + # Define the app name and author + app_name = "langflow" + app_author = "logspace" + + # Get the cache directory for the application + cache_dir = appdirs.user_cache_dir(app_name, app_author) + + # Create a .langflow directory inside the cache directory + value = Path(cache_dir) + value.mkdir(parents=True, exist_ok=True) + + if isinstance(value, str): + value = Path(value) + if not value.exists(): + value.mkdir(parents=True, exist_ok=True) + + return str(value) + + @validator("DATABASE_URL", pre=True) + def set_database_url(cls, value, values): + if not value: + logger.debug( + "No database_url provided, trying LANGFLOW_DATABASE_URL env variable" + ) + if langflow_database_url := os.getenv("LANGFLOW_DATABASE_URL"): + value = langflow_database_url + logger.debug("Using LANGFLOW_DATABASE_URL env variable.") + else: + logger.debug("No DATABASE_URL env variable, using sqlite database") + # Originally, we used sqlite:///./langflow.db + # so we need to migrate to the new format + # if there is a database in that location + if not values["CONFIG_DIR"]: + raise ValueError( + "CONFIG_DIR not set, please set it or provide a DATABASE_URL" + ) + + new_path = f"{values['CONFIG_DIR']}/langflow.db" + if Path("./langflow.db").exists(): + if Path(new_path).exists(): + logger.debug(f"Database already exists at {new_path}, using it") + else: + try: + logger.debug("Copying existing database to new location") + copy2("./langflow.db", new_path) + logger.debug(f"Copied existing database to {new_path}") + except Exception: + logger.error("Failed to copy database, using default path") + new_path = "./langflow.db" + + value = f"sqlite:///{new_path}" + + return value + + @validator("COMPONENTS_PATH", pre=True) + def set_components_path(cls, value): + if os.getenv("LANGFLOW_COMPONENTS_PATH"): + logger.debug("Adding LANGFLOW_COMPONENTS_PATH to components_path") + langflow_component_path = os.getenv("LANGFLOW_COMPONENTS_PATH") + if ( + Path(langflow_component_path).exists() + and langflow_component_path not in value + ): + if isinstance(langflow_component_path, list): + for path in langflow_component_path: + if path not in value: + value.append(path) + logger.debug( + f"Extending {langflow_component_path} to components_path" + ) + elif langflow_component_path not in value: + value.append(langflow_component_path) + logger.debug( + f"Appending {langflow_component_path} to components_path" + ) + + if not value: + value = [BASE_COMPONENTS_PATH] + logger.debug("Setting default components path to components_path") + elif BASE_COMPONENTS_PATH not in value: + value.append(BASE_COMPONENTS_PATH) + logger.debug("Adding default components path to components_path") + + logger.debug(f"Components path: {value}") + return value + + class Config: + validate_assignment = True + extra = "ignore" + env_prefix = "LANGFLOW_" + + @root_validator(allow_reuse=True) + def validate_lists(cls, values): + for key, value in values.items(): + if key != "dev" and not value: + values[key] = [] + return values + + def update_from_yaml(self, file_path: str, dev: bool = False): + new_settings = load_settings_from_yaml(file_path) + self.CHAINS = new_settings.CHAINS or {} + self.AGENTS = new_settings.AGENTS or {} + self.PROMPTS = new_settings.PROMPTS or {} + self.LLMS = new_settings.LLMS or {} + self.TOOLS = new_settings.TOOLS or {} + self.MEMORIES = new_settings.MEMORIES or {} + self.WRAPPERS = new_settings.WRAPPERS or {} + self.TOOLKITS = new_settings.TOOLKITS or {} + self.TEXTSPLITTERS = new_settings.TEXTSPLITTERS or {} + self.UTILITIES = new_settings.UTILITIES or {} + self.EMBEDDINGS = new_settings.EMBEDDINGS or {} + self.VECTORSTORES = new_settings.VECTORSTORES or {} + self.DOCUMENTLOADERS = new_settings.DOCUMENTLOADERS or {} + self.RETRIEVERS = new_settings.RETRIEVERS or {} + self.OUTPUT_PARSERS = new_settings.OUTPUT_PARSERS or {} + self.CUSTOM_COMPONENTS = new_settings.CUSTOM_COMPONENTS or {} + self.COMPONENTS_PATH = new_settings.COMPONENTS_PATH or [] + self.DEV = dev + + def update_settings(self, **kwargs): + logger.debug("Updating settings") + for key, value in kwargs.items(): + # value may contain sensitive information, so we don't want to log it + if not hasattr(self, key): + logger.debug(f"Key {key} not found in settings") + continue + logger.debug(f"Updating {key}") + if isinstance(getattr(self, key), list): + # value might be a '[something]' string + with contextlib.suppress(json.decoder.JSONDecodeError): + value = orjson.loads(str(value)) + if isinstance(value, list): + for item in value: + if isinstance(item, Path): + item = str(item) + if item not in getattr(self, key): + getattr(self, key).append(item) + logger.debug(f"Extended {key}") + else: + if isinstance(value, Path): + value = str(value) + if value not in getattr(self, key): + getattr(self, key).append(value) + logger.debug(f"Appended {key}") + + else: + setattr(self, key, value) + logger.debug(f"Updated {key}") + logger.debug(f"{key}: {getattr(self, key)}") + + +def save_settings_to_yaml(settings: Settings, file_path: str): + with open(file_path, "w") as f: + settings_dict = settings.dict() + yaml.dump(settings_dict, f) + + +def load_settings_from_yaml(file_path: str) -> Settings: + # Check if a string is a valid path or a file name + if "/" not in file_path: + # Get current path + current_path = os.path.dirname(os.path.abspath(__file__)) + + file_path = os.path.join(current_path, file_path) + + with open(file_path, "r") as f: + settings_dict = yaml.safe_load(f) + settings_dict = {k.upper(): v for k, v in settings_dict.items()} + + for key in settings_dict: + if key not in Settings.__fields__.keys(): + raise KeyError(f"Key {key} not found in settings") + logger.debug(f"Loading {len(settings_dict[key])} {key} from {file_path}") + + return Settings(**settings_dict) diff --git a/src/backend/langflow/settings.py b/src/backend/langflow/settings.py index 6a10f0506..9eea696b4 100644 --- a/src/backend/langflow/settings.py +++ b/src/backend/langflow/settings.py @@ -1,5 +1,5 @@ import contextlib -import json +import orjson import os from typing import Optional, List from pathlib import Path @@ -126,7 +126,7 @@ class Settings(BaseSettings): if isinstance(getattr(self, key), list): # value might be a '[something]' string with contextlib.suppress(json.decoder.JSONDecodeError): - value = json.loads(str(value)) + value = orjson.loads(str(value)) if isinstance(value, list): for item in value: if isinstance(item, Path): diff --git a/src/backend/langflow/template/frontend_node/llms.py b/src/backend/langflow/template/frontend_node/llms.py index a6a128cfe..fdf0a2b5b 100644 --- a/src/backend/langflow/template/frontend_node/llms.py +++ b/src/backend/langflow/template/frontend_node/llms.py @@ -1,5 +1,5 @@ -import json from typing import Optional +from langflow.database.models.base import orjson_dumps from langflow.template.field.base import TemplateField from langflow.template.frontend_node.base import FrontendNode @@ -89,7 +89,7 @@ class LLMFrontendNode(FrontendNode): if field.name == "config": field.show = True field.advanced = True - field.value = json.dumps(CTRANSFORMERS_DEFAULT_CONFIG, indent=2) + field.value = orjson_dumps(CTRANSFORMERS_DEFAULT_CONFIG, indent_2=True) @staticmethod def format_field(field: TemplateField, name: Optional[str] = None) -> None: diff --git a/src/backend/langflow/template/frontend_node/utilities.py b/src/backend/langflow/template/frontend_node/utilities.py index df993e377..fa0b55332 100644 --- a/src/backend/langflow/template/frontend_node/utilities.py +++ b/src/backend/langflow/template/frontend_node/utilities.py @@ -1,6 +1,6 @@ import ast -import json from typing import Optional +from langflow.database.models.base import orjson_dumps from langflow.template.field.base import TemplateField from langflow.template.frontend_node.base import FrontendNode @@ -22,4 +22,4 @@ class UtilitiesFrontendNode(FrontendNode): if isinstance(field.value, dict): field.field_type = "code" - field.value = json.dumps(field.value, indent=4) + field.value = orjson_dumps(field.value) diff --git a/tests/test_cache.py b/tests/test_cache.py index 50698c304..f3d0cabda 100644 --- a/tests/test_cache.py +++ b/tests/test_cache.py @@ -1,4 +1,6 @@ import json +from langflow.database.models.base import orjson_dumps +import orjson from langflow.graph import Graph import pytest @@ -63,9 +65,9 @@ def test_cache_size_limit(basic_data_graph): nodes = modified_data_graph["nodes"] node_id = nodes[0]["id"] # Now we replace all instances ode node_id with a new id in the json - json_string = json.dumps(modified_data_graph) + json_string = orjson_dumps(modified_data_graph) modified_json_string = json_string.replace(node_id, f"{node_id}_{i}") - modified_data_graph_new_id = json.loads(modified_json_string) + modified_data_graph_new_id = orjson.loads(modified_json_string) build_langchain_object_with_caching(modified_data_graph_new_id) assert len(build_langchain_object_with_caching.cache) == 10 diff --git a/tests/test_database.py b/tests/test_database.py index bc512b6b0..dd5f03933 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -1,11 +1,12 @@ -import json +from fastapi.encoders import jsonable_encoder +from langflow.database.models.base import orjson_dumps +import orjson import pytest from uuid import UUID, uuid4 from sqlalchemy.orm import Session from fastapi.testclient import TestClient -from fastapi.encoders import jsonable_encoder from langflow.api.v1.schemas import FlowListCreate from langflow.database.models.flow import Flow, FlowCreate, FlowUpdate @@ -23,7 +24,7 @@ def json_style(): # color: str = Field(index=True) # emoji: str = Field(index=False) # flow_id: UUID = Field(default=None, foreign_key="flow.id") - return json.dumps( + return orjson_dumps( { "color": "red", "emoji": "👍", @@ -32,7 +33,7 @@ def json_style(): def test_create_flow(client: TestClient, json_flow: str): - flow = json.loads(json_flow) + flow = orjson.loads(json_flow) data = flow["data"] flow = FlowCreate(name="Test Flow", description="description", data=data) response = client.post("api/v1/flows/", json=flow.dict()) @@ -48,7 +49,7 @@ def test_create_flow(client: TestClient, json_flow: str): def test_read_flows(client: TestClient, json_flow: str): - flow_data = json.loads(json_flow) + flow_data = orjson.loads(json_flow) data = flow_data["data"] flow = FlowCreate(name="Test Flow", description="description", data=data) response = client.post("api/v1/flows/", json=flow.dict()) @@ -89,7 +90,7 @@ def test_read_flows(client: TestClient, json_flow: str): def test_read_flow(client: TestClient, json_flow: str): - flow = json.loads(json_flow) + flow = orjson.loads(json_flow) data = flow["data"] flow = FlowCreate(name="Test Flow", description="description", data=data) response = client.post("api/v1/flows/", json=flow.dict()) @@ -115,7 +116,7 @@ def test_read_flow(client: TestClient, json_flow: str): def test_update_flow(client: TestClient, json_flow: str): - flow = json.loads(json_flow) + flow = orjson.loads(json_flow) data = flow["data"] flow = FlowCreate(name="Test Flow", description="description", data=data) @@ -136,7 +137,7 @@ def test_update_flow(client: TestClient, json_flow: str): def test_delete_flow(client: TestClient, json_flow: str): - flow = json.loads(json_flow) + flow = orjson.loads(json_flow) data = flow["data"] flow = FlowCreate(name="Test Flow", description="description", data=data) response = client.post("api/v1/flows/", json=flow.dict()) @@ -147,7 +148,7 @@ def test_delete_flow(client: TestClient, json_flow: str): def test_create_flows(client: TestClient, session: Session, json_flow: str): - flow = json.loads(json_flow) + flow = orjson.loads(json_flow) data = flow["data"] # Create test data flow_list = FlowListCreate( @@ -172,7 +173,7 @@ def test_create_flows(client: TestClient, session: Session, json_flow: str): def test_upload_file(client: TestClient, session: Session, json_flow: str): - flow = json.loads(json_flow) + flow = orjson.loads(json_flow) data = flow["data"] # Create test data flow_list = FlowListCreate( @@ -181,7 +182,7 @@ def test_upload_file(client: TestClient, session: Session, json_flow: str): FlowCreate(name="Flow 2", description="description", data=data), ] ) - file_contents = json.dumps(flow_list.dict()) + file_contents = orjson_dumps(flow_list.dict()) response = client.post( "api/v1/flows/upload/", files={"file": ("examples.json", file_contents, "application/json")}, @@ -200,7 +201,7 @@ def test_upload_file(client: TestClient, session: Session, json_flow: str): def test_download_file(client: TestClient, session: Session, json_flow): - flow = json.loads(json_flow) + flow = orjson.loads(json_flow) data = flow["data"] # Create test data flow_list = FlowListCreate( @@ -241,7 +242,7 @@ def test_get_nonexistent_flow(client: TestClient): def test_update_flow_idempotency(client: TestClient, json_flow: str): - flow_data = json.loads(json_flow) + flow_data = orjson.loads(json_flow) data = flow_data["data"] flow_data = FlowCreate(name="Test Flow", description="description", data=data) response = client.post("api/v1/flows/", json=flow_data.dict()) @@ -253,7 +254,7 @@ def test_update_flow_idempotency(client: TestClient, json_flow: str): def test_update_nonexistent_flow(client: TestClient, json_flow: str): - flow_data = json.loads(json_flow) + flow_data = orjson.loads(json_flow) data = flow_data["data"] uuid = uuid4() updated_flow = FlowCreate( diff --git a/tests/test_loading.py b/tests/test_loading.py index 11fa8e471..e5c409c93 100644 --- a/tests/test_loading.py +++ b/tests/test_loading.py @@ -1,5 +1,4 @@ import json - import pytest from langchain.chains.base import Chain from langflow.processing.process import load_flow_from_json From ecf217dce8f22514de824065765b52bbffa8eb03 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 11:37:51 -0300 Subject: [PATCH 025/134] =?UTF-8?q?=F0=9F=90=9B=20fix(chat.py):=20remove?= =?UTF-8?q?=20unnecessary=20try-except=20block=20for=20building=20the=20gr?= =?UTF-8?q?aph=20and=20handle=20any=20exceptions=20thrown=20by=20Graph.fro?= =?UTF-8?q?m=5Fpayload()=20method=20=F0=9F=94=A7=20refactor(chat.py):=20im?= =?UTF-8?q?prove=20logging=20output=20for=20built=20node=20parameters=20in?= =?UTF-8?q?=20stream=5Fbuild()=20method?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/chat.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/backend/langflow/api/v1/chat.py b/src/backend/langflow/api/v1/chat.py index 06a2fdda0..e71ddf81f 100644 --- a/src/backend/langflow/api/v1/chat.py +++ b/src/backend/langflow/api/v1/chat.py @@ -104,14 +104,9 @@ async def stream_build(flow_id: str): return logger.debug("Building langchain object") - try: - # Some error could happen when building the graph - graph = Graph.from_payload(graph_data) - except Exception as exc: - logger.exception(exc) - error_message = str(exc) - yield str(StreamData(event="error", data={"error": error_message})) - return + + # Some error could happen when building the graph + graph = Graph.from_payload(graph_data) number_of_nodes = len(graph.nodes) flow_data_store[flow_id]["status"] = BuildStatus.IN_PROGRESS @@ -126,7 +121,9 @@ async def stream_build(flow_id: str): params = vertex._built_object_repr() valid = True logger.debug(f"Building node {str(vertex.vertex_type)}") - logger.debug(f"Output: {params}") + logger.debug( + f"Output: {params[:100]}{'...' if len(params) > 100 else ''}" + ) if vertex.artifacts: # The artifacts will be prompt variables # passed to build_input_keys_response From 44ce4eac5c360483e160eface7af903a4d3ec878 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 11:38:24 -0300 Subject: [PATCH 026/134] =?UTF-8?q?=F0=9F=94=A7=20fix(endpoints.py):=20ref?= =?UTF-8?q?actor=20logger.debug=20statement=20to=20improve=20readability?= =?UTF-8?q?=20and=20provide=20more=20information=20=F0=9F=94=A7=20fix(base?= =?UTF-8?q?.py):=20remove=20redundant=20logger.debug=20statement=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(directory=5Freader.py):=20refactor=20logger.?= =?UTF-8?q?debug=20statement=20to=20improve=20readability=20and=20provide?= =?UTF-8?q?=20more=20information=20=F0=9F=94=A7=20fix(types.py):=20refacto?= =?UTF-8?q?r=20logger.debug=20statement=20to=20improve=20readability=20and?= =?UTF-8?q?=20provide=20more=20information?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/endpoints.py | 4 +++- src/backend/langflow/graph/edge/base.py | 1 - src/backend/langflow/interface/custom/directory_reader.py | 2 +- src/backend/langflow/interface/types.py | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/backend/langflow/api/v1/endpoints.py b/src/backend/langflow/api/v1/endpoints.py index 1e1524222..2c109224b 100644 --- a/src/backend/langflow/api/v1/endpoints.py +++ b/src/backend/langflow/api/v1/endpoints.py @@ -56,7 +56,9 @@ def get_all(): logger.info(f"Loading {len(custom_component_dicts)} category(ies)") for custom_component_dict in custom_component_dicts: - logger.debug(custom_component_dict) + logger.debug( + {key: len(value) for key, value in custom_component_dict.items()} + ) custom_components_from_file = merge_nested_dicts_with_renaming( custom_components_from_file, custom_component_dict ) diff --git a/src/backend/langflow/graph/edge/base.py b/src/backend/langflow/graph/edge/base.py index 569d33ec0..dc7eab328 100644 --- a/src/backend/langflow/graph/edge/base.py +++ b/src/backend/langflow/graph/edge/base.py @@ -40,7 +40,6 @@ class Edge: if no_matched_type: logger.debug(self.source_types) logger.debug(self.target_reqs) - if no_matched_type: raise ValueError( f"Edge between {self.source.vertex_type} and {self.target.vertex_type} " f"has no matched type" diff --git a/src/backend/langflow/interface/custom/directory_reader.py b/src/backend/langflow/interface/custom/directory_reader.py index 7bff7b5f5..44b2d4f1b 100644 --- a/src/backend/langflow/interface/custom/directory_reader.py +++ b/src/backend/langflow/interface/custom/directory_reader.py @@ -77,7 +77,7 @@ class DirectoryReader: ] filtered = [menu for menu in items if menu["components"]] logger.debug( - f'Filtered components {"with errors" if with_errors else ""}: {filtered}' + f'Filtered components {"with errors" if with_errors else ""}: {len(filtered)}' ) return {"menu": filtered} diff --git a/src/backend/langflow/interface/types.py b/src/backend/langflow/interface/types.py index bbdcb4461..824b0af50 100644 --- a/src/backend/langflow/interface/types.py +++ b/src/backend/langflow/interface/types.py @@ -337,7 +337,9 @@ def build_valid_menu(valid_components): valid_menu[menu_name] = {} for component in menu_item["components"]: - logger.debug(f"Building component: {component}") + logger.debug( + f"Building component: {component.get('name'), component.get('output_types')}" + ) try: component_name = component["name"] component_code = component["code"] From 22072084f8ed51f44379421dd037b147b1347d1d Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 11:38:36 -0300 Subject: [PATCH 027/134] =?UTF-8?q?=F0=9F=90=9B=20fix(schemas.py):=20fix?= =?UTF-8?q?=20indentation=20issue=20in=20the=20=5F=5Fstr=5F=5F=20method=20?= =?UTF-8?q?of=20StreamData=20class=20to=20improve=20code=20readability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/schemas.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/api/v1/schemas.py b/src/backend/langflow/api/v1/schemas.py index bbff0de4a..de0348d38 100644 --- a/src/backend/langflow/api/v1/schemas.py +++ b/src/backend/langflow/api/v1/schemas.py @@ -115,7 +115,9 @@ class StreamData(BaseModel): data: dict def __str__(self) -> str: - return f"event: {self.event}\ndata: {orjson_dumps(self.data)}\n\n" + return ( + f"event: {self.event}\ndata: {orjson_dumps(self.data, indent_2=False)}\n\n" + ) class CustomComponentCode(BaseModel): From fb028e55b84fa73a814d4718f34751662e6b6778 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 11:38:48 -0300 Subject: [PATCH 028/134] =?UTF-8?q?=E2=9C=A8=20feat(GetRequest.py):=20add?= =?UTF-8?q?=20GetRequest=20component=20to=20make=20a=20GET=20request=20to?= =?UTF-8?q?=20a=20given=20URL=20=E2=9C=A8=20feat(PostRequest.py):=20add=20?= =?UTF-8?q?PostRequest=20component=20to=20make=20a=20POST=20request=20to?= =?UTF-8?q?=20a=20given=20URL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/utilities/GetRequest.py | 29 +++++++++++++++++ .../components/utilities/PostRequest.py | 31 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 src/backend/langflow/components/utilities/GetRequest.py create mode 100644 src/backend/langflow/components/utilities/PostRequest.py diff --git a/src/backend/langflow/components/utilities/GetRequest.py b/src/backend/langflow/components/utilities/GetRequest.py new file mode 100644 index 000000000..baa2139c2 --- /dev/null +++ b/src/backend/langflow/components/utilities/GetRequest.py @@ -0,0 +1,29 @@ +from langflow import CustomComponent +from langchain.schema import Document +from langflow.database.models.base import orjson_dumps +import requests +from typing import Optional + + +class GetRequest(CustomComponent): + display_name: str = "Get Request" + description: str = "Make a GET request to the given URL" + output_types: list[str] = ["Document"] + beta = True + field_config = { + "url": {"display_name": "URL"}, + "headers": {"display_name": "Headers", "field_type": "code"}, + "code": {"show": False}, + } + + def build( + self, + url: str, + headers: Optional[dict] = None, + ) -> Document: + if headers is None: + headers = {} + with requests.get(url, headers=headers) as result: + result = result.json() + self.repr_value = result + return Document(page_content=orjson_dumps(result)) diff --git a/src/backend/langflow/components/utilities/PostRequest.py b/src/backend/langflow/components/utilities/PostRequest.py new file mode 100644 index 000000000..83ae9db34 --- /dev/null +++ b/src/backend/langflow/components/utilities/PostRequest.py @@ -0,0 +1,31 @@ +from langflow import CustomComponent +from langchain.schema import Document +from langflow.database.models.base import orjson_dumps +import requests +from typing import Optional + + +class PostRequest(CustomComponent): + display_name: str = "Post Request" + description: str = "Make a POST request to the given URL" + output_types: list[str] = ["Document"] + beta = True + field_config = { + "url": {"display_name": "URL"}, + "headers": {"display_name": "Headers", "field_type": "code"}, + "code": {"show": False}, + "document": {"display_name": "Document"}, + } + + def build( + self, + document: Document, + url: str, + headers: Optional[dict] = None, + ) -> Document: + if headers is None: + headers = {} + with requests.post(url, headers=headers, json=document.page_content) as result: + result = result.json() + self.repr_value = result + return Document(page_content=orjson_dumps(result)) From b8b9bb25bc253c2eb4e5d19a1470775b2b134dc8 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 11:56:01 -0300 Subject: [PATCH 029/134] =?UTF-8?q?=F0=9F=93=A6=20feat(JSONDocumentBuilder?= =?UTF-8?q?.py):=20add=20JSONDocumentBuilder=20component=20to=20build=20a?= =?UTF-8?q?=20Document=20containing=20a=20JSON=20object=20using=20a=20key?= =?UTF-8?q?=20and=20another=20Document=20page=20content=20=F0=9F=93=9D=20d?= =?UTF-8?q?ocs(JSONDocumentBuilder.py):=20add=20description=20and=20field?= =?UTF-8?q?=20configuration=20for=20JSONDocumentBuilder=20component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utilities/JSONDocumentBuilder.py | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/backend/langflow/components/utilities/JSONDocumentBuilder.py diff --git a/src/backend/langflow/components/utilities/JSONDocumentBuilder.py b/src/backend/langflow/components/utilities/JSONDocumentBuilder.py new file mode 100644 index 000000000..0336dcc1b --- /dev/null +++ b/src/backend/langflow/components/utilities/JSONDocumentBuilder.py @@ -0,0 +1,34 @@ +### JSON Document Builder + +# Build a Document containing a JSON object using a key and another Document page content. + +# **Params** + +# - **Key:** The key to use for the JSON object. +# - **Document:** The Document page to use for the JSON object. + +# **Output** + +# - **Document:** The Document containing the JSON object. + +from langflow import CustomComponent +from langchain.schema import Document + + +class JSONDocumentBuilder(CustomComponent): + display_name: str = "JSON Document Builder" + description: str = "Build a Document containing a JSON object using a key and another Document page content." + output_types: list[str] = ["Document"] + beta = True + + field_config = { + "key": {"display_name": "Key"}, + "document": {"display_name": "Document"}, + } + + def build( + self, + key: str, + document: Document, + ) -> Document: + return Document(page_content={key: document.page_content}) From 9f617ff6f1b0c46e904dbe655c3e439413a8a0a8 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 11:56:14 -0300 Subject: [PATCH 030/134] =?UTF-8?q?=F0=9F=93=9D=20docs(utilities.mdx):=20u?= =?UTF-8?q?pdate=20Utilities=20documentation=20with=20additional=20section?= =?UTF-8?q?s=20and=20improve=20formatting=20for=20better=20readability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs/components/utilities.mdx | 49 +++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/docs/docs/components/utilities.mdx b/docs/docs/components/utilities.mdx index f510990ce..cb0aa808e 100644 --- a/docs/docs/components/utilities.mdx +++ b/docs/docs/components/utilities.mdx @@ -1,10 +1,51 @@ -import Admonition from '@theme/Admonition'; +import Admonition from "@theme/Admonition"; # Utilities -

- We appreciate your understanding as we polish our documentation – it may contain some rough edges. Share your feedback or report issues to help us improve! 🛠️📝 -

+

+ We appreciate your understanding as we polish our documentation – it may + contain some rough edges. Share your feedback or report issues to help us + improve! 🛠️📝 +

+### Get Request + +Make a GET request to the given URL. + +**Params** + +- **URL:** The URL to make the request to. +- **Headers:** A dictionary of headers to send with the request. + +**Output** + +- **Document:** The JSON response from the request as a Document. + +### POST Request + +Make a POST request to the given URL. + +**Params** + +- **URL:** The URL to make the request to. +- **Headers:** A dictionary of headers to send with the request. +- **Document:** The Document containing a JSON object to send with the request. + +**Output** + +- **Document:** The JSON response from the request as a Document. + +### JSON Document Builder + +Build a Document containing a JSON object using a key and another Document page content. + +**Params** + +- **Key:** The key to use for the JSON object. +- **Document:** The Document page to use for the JSON object. + +**Output** + +- **Document:** The Document containing the JSON object. From 62b9bb523c7ee20a846bf47bb63ee51c0bc6c5bd Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 14:56:34 -0300 Subject: [PATCH 031/134] =?UTF-8?q?=F0=9F=94=A7=20fix(GetRequest.py):=20im?= =?UTF-8?q?prove=20code=20readability=20and=20add=20support=20for=20multip?= =?UTF-8?q?le=20URLs=20and=20headers=20in=20GetRequest=20component=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(PostRequest.py):=20improve=20code=20readabil?= =?UTF-8?q?ity=20and=20add=20support=20for=20multiple=20documents,=20URLs,?= =?UTF-8?q?=20and=20headers=20in=20PostRequest=20component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/utilities/GetRequest.py | 55 ++++++++++++++++--- .../components/utilities/PostRequest.py | 55 ++++++++++++++++--- 2 files changed, 96 insertions(+), 14 deletions(-) diff --git a/src/backend/langflow/components/utilities/GetRequest.py b/src/backend/langflow/components/utilities/GetRequest.py index baa2139c2..424106f31 100644 --- a/src/backend/langflow/components/utilities/GetRequest.py +++ b/src/backend/langflow/components/utilities/GetRequest.py @@ -7,15 +7,57 @@ from typing import Optional class GetRequest(CustomComponent): display_name: str = "Get Request" - description: str = "Make a GET request to the given URL" + description: str = "Make a GET request to the given URL." output_types: list[str] = ["Document"] beta = True field_config = { - "url": {"display_name": "URL"}, - "headers": {"display_name": "Headers", "field_type": "code"}, + "url": { + "display_name": "URL", + "info": "The URL to make the request to", + "is_list": True, + }, + "headers": { + "display_name": "Headers", + "field_type": "code", + "info": "The headers to send with the request.", + }, "code": {"show": False}, } + def get_document( + self, + url: str, + headers: Optional[dict] = None, + ) -> Document: + try: + if headers is None: + headers = {} + with requests.Session() as session: + response = session.get(url, headers=headers) + try: + response_json = response.json() + result = orjson_dumps(response_json, indent_2=False) + except Exception: + result = response.text + self.repr_value = result + return Document( + page_content=result, + metadata={ + "source": url, + "headers": headers, + "status_code": response.status_code, + }, + ) + except Exception as exc: + return Document( + page_content=str(exc), + metadata={ + "source": url, + "headers": headers, + "status_code": 500, + }, + ) + def build( self, url: str, @@ -23,7 +65,6 @@ class GetRequest(CustomComponent): ) -> Document: if headers is None: headers = {} - with requests.get(url, headers=headers) as result: - result = result.json() - self.repr_value = result - return Document(page_content=orjson_dumps(result)) + if not isinstance(url, list): + url = [url] + return [self.get_document(u, headers) for u in url] diff --git a/src/backend/langflow/components/utilities/PostRequest.py b/src/backend/langflow/components/utilities/PostRequest.py index 83ae9db34..2f0ab2053 100644 --- a/src/backend/langflow/components/utilities/PostRequest.py +++ b/src/backend/langflow/components/utilities/PostRequest.py @@ -7,16 +7,55 @@ from typing import Optional class PostRequest(CustomComponent): display_name: str = "Post Request" - description: str = "Make a POST request to the given URL" + description: str = "Make a POST request to the given URL." output_types: list[str] = ["Document"] beta = True field_config = { - "url": {"display_name": "URL"}, - "headers": {"display_name": "Headers", "field_type": "code"}, + "url": {"display_name": "URL", "info": "The URL to make the request to."}, + "headers": { + "display_name": "Headers", + "field_type": "code", + "info": "The headers to send with the request.", + }, "code": {"show": False}, "document": {"display_name": "Document"}, } + def post_document( + self, + document: Document, + url: str, + headers: Optional[dict] = None, + ) -> Document: + try: + with requests.Session() as session: + response = session.post( + url, headers=headers, data=document.page_content + ) + try: + response_json = response.json() + result = orjson_dumps(response_json, indent_2=False) + except Exception: + result = response.text + self.repr_value = result + return Document( + page_content=result, + metadata={ + "source": url, + "headers": headers, + "status_code": response, + }, + ) + except Exception as exc: + return Document( + page_content=str(exc), + metadata={ + "source": url, + "headers": headers, + "status_code": 500, + }, + ) + def build( self, document: Document, @@ -25,7 +64,9 @@ class PostRequest(CustomComponent): ) -> Document: if headers is None: headers = {} - with requests.post(url, headers=headers, json=document.page_content) as result: - result = result.json() - self.repr_value = result - return Document(page_content=orjson_dumps(result)) + + if not isinstance(document, list): + document = [document] + documents = [self.post_document(doc, url, headers) for doc in document] + self.repr_value = documents + return documents From 6e18e795ff44772f1f82afa77980f69645aa5873 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 14:58:52 -0300 Subject: [PATCH 032/134] =?UTF-8?q?=F0=9F=94=A7=20chore(GetRequest.py):=20?= =?UTF-8?q?refactor=20GetRequest=20class=20to=20store=20the=20returned=20d?= =?UTF-8?q?ocuments=20in=20a=20repr=5Fvalue=20attribute=20for=20debugging?= =?UTF-8?q?=20purposes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/components/utilities/GetRequest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/components/utilities/GetRequest.py b/src/backend/langflow/components/utilities/GetRequest.py index 424106f31..856fd82c5 100644 --- a/src/backend/langflow/components/utilities/GetRequest.py +++ b/src/backend/langflow/components/utilities/GetRequest.py @@ -67,4 +67,6 @@ class GetRequest(CustomComponent): headers = {} if not isinstance(url, list): url = [url] - return [self.get_document(u, headers) for u in url] + documents = [self.get_document(u, headers) for u in url] + self.repr_value = documents + return documents From 5fa8281e94e9984e379b3ae1d270351c705f309c Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 14:59:00 -0300 Subject: [PATCH 033/134] =?UTF-8?q?=F0=9F=90=9B=20fix(JSONDocumentBuilder.?= =?UTF-8?q?py):=20handle=20both=20single=20document=20and=20list=20of=20do?= =?UTF-8?q?cuments=20when=20building=20JSON=20document=20=E2=9C=A8=20feat(?= =?UTF-8?q?JSONDocumentBuilder.py):=20add=20support=20for=20building=20JSO?= =?UTF-8?q?N=20document=20from=20a=20list=20of=20documents?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/utilities/JSONDocumentBuilder.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/components/utilities/JSONDocumentBuilder.py b/src/backend/langflow/components/utilities/JSONDocumentBuilder.py index 0336dcc1b..4880200da 100644 --- a/src/backend/langflow/components/utilities/JSONDocumentBuilder.py +++ b/src/backend/langflow/components/utilities/JSONDocumentBuilder.py @@ -31,4 +31,12 @@ class JSONDocumentBuilder(CustomComponent): key: str, document: Document, ) -> Document: - return Document(page_content={key: document.page_content}) + documents = None + if isinstance(document, list): + documents = [ + Document(page_content={key: doc.page_content}) for doc in document + ] + else: + documents = Document(page_content={key: document.page_content}) + self.repr_value = documents + return documents From 185754e2cdd789f0152a2cb822a18e88be7d7d6b Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Tue, 22 Aug 2023 15:00:14 -0300 Subject: [PATCH 034/134] a --- docs/static/videos/langflow_widget.mp4 | Bin 22557323 -> 22557006 bytes img/langflow-demo.gif | Bin 2092059 -> 2092028 bytes src/frontend/public/favicon.ico | Bin 104188 -> 104187 bytes src/frontend/src/icons/Airbyte/airbyte.svg | 44 ++++++++++----------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/static/videos/langflow_widget.mp4 b/docs/static/videos/langflow_widget.mp4 index 7894316f7175848ffa01c5a4531597c7808b31fa..d5514a94877da10ad734f4aa384a8bd587dd2001 100644 GIT binary patch delta 2864 zcmWmDdsxi*7r^o7G~H{uO+~^qLrRG*LTYN#NTT}{iKrEF=_ZP#OrI{B@9wfHl0~A3 zNRCuKt!rgvA{${VL}-yqWPkGe_~Z5d_dL&e&dKlV(QJFtqnWW2&M9qj#}s!ZQ7tJR zQet>mJfv(Gh^M?%RD|T*Diu7pO4Ygpdz{s-DU))k8l#ToQjNL;xcncDl@stPXezD4 z8|yVc24F*z=2Qi~{zWV6EpEur{+fYnfFG-bcX|AXooJiGA2SOVH1RKHp{h)0aX5)8 z(P4BMJw~4~z^D?z*~4h)X4q{B99y_@c=bjt)M>0O2JYM$%4t0!Q{)&WAA!EjfFpP?G zO|bXAIOhSbIXj_Qg*aT8fDRWXZoW=VrkgX9@MOBhp>Fhzw2V(DO^+;@$&3{?J+kf% z!Nc}b>e?^@Y%H^hoYwnjn(I(8_~v9G;LT6*oVrPtwJ zF&<2t?lgfsD4mWEN*%9m#?nzUj=2%fuo>tXHnYnIMMr0jj3H)CGtsPRmgyqmV&a4@ zCbJVh<7qwTBoi{x${8nGxx}`Rf)6fO@Imq@o2*H7#WksJBO$n2;r5dUDg@G7TBKAc z#ZsZW_W|;8)9t=%3;x;Xg8V}XcB^kmFjl<0Y`t-y*p z&oP#GwbxSysPWWudMa^UIuBi!dMz#|#k~1g%=7Nj#Uz1u;VGhh*_&CwEJW?gJ_q)a z%5Yz-4EOujofPf!!=iouLE~@${XY$oClvuqAU>%G^07eM_Mq;^MDKJk>YWZ*24rJ( z2yUznjpmbkjiGq2F-*xH@AJcx4T!HXthu9fj|4{)9&!CVK|El4<|g}Px0JyY;qR>JHIVy&Er z*2+m+>+pDEQu=mcAxTCH$)>YX?Ao^JQ#mRormQnXS7{30o-9mAVKy^cm{cYW7ba{S zjz`aDTgNTNXxD8k>q+zQHYOdLhqt>~5_NF~s*87MbP$7~9ZV(~3}w}qV%wgbt_{c! zkk1el%A)0uh$u$RWTPmC*qM`{Ji_E)P+qRs3pd@#tviOcsd+tvs2`VKI}LB_&(C+l zpnLhxBxIK0XPhM{ICKiT{w&Bc#>o2xay@+3U$Cu)tSH&VaJZu6moMMRl9FF>Ny%^e z!DQXL-*DZ#-6!1c(bUKwOl* z3l-Hx5JT=56*K$rj?sRb_-wL2o0Oa<2O`UGnRRL7WgPdW)an&_-9I>Ah`)V4xNS1g z6a9gDqC;$0gZ-fs^(6MqA&h-iy35oe9an(3rFQ zZj6@IY{G^wIShWR%>xh!W1*Q&_94=bv zppE;*^PTu?bbYfiR!ys~a3EnT>oII)LsTHCt8Ku#+Q!~I+%LW4piXXkU1BKHgtxu^ zymFK5HoT0x4X-3b64k^j%vI(ZswQ6lvj>}lZg_r2-Js?V{m64^*)x+ACAMHuVyoDj z)Hk*=H<`b%zVX(i0ruH#?6YsnlQCAP*jItP7KK8Iblg;6$IbTsW^CMZM>hg*y}LtK zVL|xarp?5+{VvnN+++S`I+^>-1E#CcxBa04g?AqA>Bn;yA4S|i{mjQ>7Zpx@_?Y1N zhmYF?D1ZCdXg}`H`={8FIM)2bbfaTUPxEyg+0yG*h`#zyP786w_Q@Sh((e2O+nt|U zug7l{PnWx3izFa;TUfqYotDh$z#))1C zoJmH+3(Sb3@-VWY=y1Y zzh#8u0^!J+0sN-*-QJPdx_{5NbqC5o@&;O74Ny9VoBIKP&i$YSyJBcZI1d8FoJATB zSd@WUq^W@E1I{B@6;I{um+?laWqr|C=JzwPG4GhR1+4((m}o!>{v__W3|Ag zj8R0cxN66_1?T~bK2Wy+190== zwig=!-Cit!F@tnpo*}5$&?6Ef5LeLa&y8TAI~7%gVEvlQkvIU$bf7sBN4Tv-!=;YUD5J)5M;LOW{A-TD z+s^6BW&qWf&4i&%RK0#CjKp(lHnV`L**L+Md6$x%V3Izy$aVscL2hlzY@lmXoFTfF zQ%rFIs+b}HJ#VgelLTn*CRdmfPbc=fg5g5WX}TLwr|D7ztOeC$P->5ig)x&htUn zkTdn057gAp8*-M>vQyp=uFZYB=nX6jfPTBU5IiEOyNM6|ZZWxIEH@%c8M3D2 zNO9~Eni@=$l%>Yjv=Cy{@A=Lj&-=XJ=RD`!bI*CtIW;d@G`6<3Xl&R-=aiBslZYix zRx&RmkxcPP2~cK=Pbvl>&`@C=hSE~- ziD36DqKg^e9?76Nk@%g!eS-jPKnKtT^jP3N{gT7*kl3Kv0iKo>2CQYpV4YjgI$aEH zL|_vi!{B3ROL%X{65bEl@CWjD6-IzDdsku79}dr3y`e*@p;OaPMoq)4>!I148-6ee zTx~r<`vmyO!x2Bdg~yef0%m|YbLAG<#%R0t*dpr**ssL0Y5+WX7c80Hg^_D8580M9 zD_|7ck~aEKGd#9YV^*d?-}iJ3U=7%?eNSzlhoLRi@rUvnunXCZ*$hvV%#KCL#(ojT z4v)5PSq9Ce)}Fc4jw_vn{Ef(gy%9Nzx!AOC0%yoqa_T(JkTlle~UWWMu_ zHPBWJaXBi6HYCD@4T+f05CE;Ka6+F6v<^Ojb?}KpXCv1zc4ZpIZqmKdB0fxN5@zR=;>ny+#C^id9c#slB;Z_qult&4TWIRV7Mf1>Lq*8W zR89uG*_leoMlBL49PUVjLZE7i=U}k7S+YtST>6h>hB@qg+CIP()~7u+p$K|>`BalJ z;Ed-}eF%K}#Z;#h_`c1X#=gz-o%1{LFy-kiOxdqN7{^}UPjMRBt*d^(48Wh=x*D*5 zH?)|@nJgwUupPxN3)&mVg7yZ54o9B?7Sz)PEw?Bb2w}NJp#h_zx7LO>H$lH~dKSBJ zI_yXMzRa>Xj9C_k$D+7ovPR|K$Y@Ug-a%e*q8! z!~zR}MeIrcV$R{o<#CtcDGQH(`rnR($6KXCj;N2{1D170{*QG=CfH$$Yb5O0!#QGIe2Ljq^wAx-6j%l<2UalMfh!lzM|*P2$|XWgzVMJ* z4FapqkRHOWvt!}XmLI@b8B#Z#ZP_*DM0QPi)w*(Mo|jgot%p|Wk;E!Jl1qf&U6z{M zgY9E6BUdjS3a%Be7CFMxv~o4D2KX6B0oJmnmFs#}!t>Y5b;IX?KTJxEsem`UHx)=@ z;l1m{C==N(^9^j5dAd6OpDe#89oWe7don8W(P#F~O`ertMNp=TJ}U8kOy*PAiefW? z&8#R^=3s^IhHM#-#Tv4+Eqr1Bw=TQ4 za=l+zxn9m8>@=HmH7COm+*F^FsRLf{Iw!Rhp60x5fSfhw{raUJ-}QOhS$*Dby0ehK z?)Z(p?$~ic7ycczvqcqJqWVsjsJ<)F99o;ruF>znBE#LmpTJRCia4Ag*)4MgyJeo6 zwhfw3aV{-{Hf8W0U@x08IL{8tCX;T?1NJfL=KWEH@YUMnU%Cd)Y0tO8wZ>Tef$63s zI{*1Vsx|DXW(QfS*`fcYGRE=H31Oulv>##*+7GJ@fxS_sAR32(c?>K#D+aeuDe$QQ zI~Wwk#e?^x7H$?Q!Zf>3PfgIb7ph;z7;b?_m|NiQ>YdOe;-i_u4PSNbs5S@Jryp}} zhDR&9h-pP1Uncyul;q>U36_$4Qbl-e(o#;cw3Jh4gcriD^pw&YX!iR~18121zT#JZ zLDx?_yG2;8{X5TA1cD=9oee`ZvQx1oB8<;2N=lb!gRSqEK5|C?KBaT4PpNE#aB7A{ zmWhPQx6UtP*7@fjH9+fI!)Bp^Wg(6ifN~b%c+p0v`gL9x&)0(;jVh{yt^PW;qG&vP z1q&)z!Gg+Yyqq$XvPz~>cIo*Rw6}^ckH=cbjC?Nx9Js=ae6L==3$0QA8f(8-0R=sPI%_SAmxtdOb?uffyY@9dl)^poCUjnZlhKjhyltAV?~J@&ow z{;2oREQ@NGWzip*N$7KIMD5-puy<8$EnZxi-rZWJcen0!6|}EA{?wiaR`2|iF9ugd zJh*~aLzY$h0C)&I0{#N(fyclTph1yU+bG=Sk#&tbg=xJne>(3r*f+gt*lZlI*oGz< zKHoJo)!@9b@_(8J=YeaopY0ig(HECI1De_5l9sAl(CvSI9;g7P>AW~&3bq^f;!h3u z`rTfzez%vl%b?j5z5K}oyruQ!G-3DZOkS}%lh*TsU*^`jMEIQ#0j-6?+pn10nk`(@ zX7R1eEWS<3p#5g{x4t{HBXj>|N9Mk+!C}Zue3O~@HZ$>ES>pTLkML;ry#FHXymD>3 zn(((YFZ>gVCx=BjcBra>7rJ$HkHZ)d2^~Nui%962gz98Fmv_--@UEV&x2fRuiQSLw zz!8VKk1b(+q7N3K!fc{HFtg~73^%2$KIbE=&*{mNBbN^U1bk-F;a{r0pqHCrZyRn~ znc1pd;43p*^=-benyKHuy*U7VQQp67QQr3?8)%I;zi)^H&mGZs7W>Y$H2WQe)$#P| z-|Fc_9H6A-B;uuKi1NKjBoFQ;;=$cYv<=qy5WE}&mbK_(8cV7^hoRrDK%G* zcxtXbnRLOa$TlFgQX~gF29pI!n_q1mO#YLRh(;UImTD56QFIv+E(5tjZwPUPo)PVR zjAn;-Msyd2%m1w~rr&Xi$PXVeA%6JCP};p8UlS$62w}JoMi8GUF{PLS=y`3XgkUBF zbK-ez7L<*nFCY2cf)Ff;kNiH8y73rrLw73@t^mF|$BMe~+VS`rD+)oG$}8Hf2w@cQ ziuTdeIv&zN^D%^AP5hv_4e7$g&wANV%P(l#e&2@p_WQQPMnm@Pv87NHwLDMh2TViB zP6%T$7bSZN$Kx*VGO#Cvam2d}9LQK1eKd?5Xd+%Jxp%MwaqnP9vc)?hU+OWQ5S)lF z^>C&?u&3NZ>`a$@ko0Ca(Kj_b~(ydLguZx`a--V^9kGUV6g6Q~ali@eQtBJnm` zSNbvy^0P!&8l{UwCDWB8*d+P1WH;i|lHDn`3|}W~J&2#MokTjgvE&s=lduL!p5%>@ z`1dwXGVq72J6=p&cf1#wh$n23fdE+3Y(BB43C;m3TkFtJ* zU3$uoBDEk_m-`XI4C2-0{v^T8%tb~4)RKmzeRlxG?SLuFW+ov75)ZQpqI+g&GoKMe zf8$JYwd5eWf#WZ~R}e(}UO_OOFM+%ueXf91*b8$H1P#Vz=wXZ2Dg5(2QNLhuI>lX zS+{^l2*{_mN$?2k^|v+V3C}Qx1s4jp1s4ktNQV|*3x^h847V0v4R}qrkE{*w)rWwB z4!3}U57*YWSXmIMezyYH5Qs^Kiy;w*iy;z+iy;%Yiy;)AGq);L6si2T)KL|nPlt7( z6}NSv79>W8n&%dWn&%gXn&%j|n&%k-nzx*R8cQ9A=$;yf=$;$5=$;%1@rUt`9k=n1 M9v_>x5i1`G!FcO+)Bpeg delta 324 zcmex!y?*wM`VD(Z8F@GFDcyd6k#~Es8RG{vAe|h`*b)V#pKoU@WdqVN`xraaf%KE7 zjLtt9dE3?RGi_JD&&r$|?PpzX2&6SXvU&o|Z7f#da8Ag%h0^Sl92?H4hw?O(*W1w4RkmUwO; z=Go2?&s*UOR8zBt_rq17cuo`F_M9gE>(_u{&XEEu>wxr|>jE8~K)Dh{K_C_aV&Uy2 ziX!ujfpS8jA}jv@>D_^%3;cm - - - - - + + + + + + From 696a139171d82a9df19f84b5b59c17ba898d6eba Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 15:31:47 -0300 Subject: [PATCH 035/134] =?UTF-8?q?=F0=9F=90=9B=20fix(GetRequest.py):=20ha?= =?UTF-8?q?ndle=20request=20timeout=20by=20returning=20a=20Document=20with?= =?UTF-8?q?=20status=20code=20408=20and=20"Request=20Timed=20Out"=20conten?= =?UTF-8?q?t=20=E2=9C=A8=20feat(GetRequest.py):=20add=20timeout=20paramete?= =?UTF-8?q?r=20to=20the=20build=20method=20to=20allow=20configuring=20the?= =?UTF-8?q?=20request=20timeout=20value?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/utilities/GetRequest.py | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/src/backend/langflow/components/utilities/GetRequest.py b/src/backend/langflow/components/utilities/GetRequest.py index 856fd82c5..018b92751 100644 --- a/src/backend/langflow/components/utilities/GetRequest.py +++ b/src/backend/langflow/components/utilities/GetRequest.py @@ -25,48 +25,46 @@ class GetRequest(CustomComponent): } def get_document( - self, - url: str, - headers: Optional[dict] = None, + self, session: requests.Session, url: str, headers: Optional[dict], timeout: int ) -> Document: try: - if headers is None: - headers = {} - with requests.Session() as session: - response = session.get(url, headers=headers) - try: - response_json = response.json() - result = orjson_dumps(response_json, indent_2=False) - except Exception: - result = response.text - self.repr_value = result - return Document( - page_content=result, - metadata={ - "source": url, - "headers": headers, - "status_code": response.status_code, - }, - ) - except Exception as exc: + response = session.get(url, headers=headers, timeout=timeout) + try: + response_json = response.json() + result = orjson_dumps(response_json, indent=2) + except Exception: + result = response.text + self.repr_value = result return Document( - page_content=str(exc), + page_content=result, metadata={ "source": url, "headers": headers, - "status_code": 500, + "status_code": response.status_code, }, ) + except requests.Timeout: + return Document( + page_content="Request Timed Out", + metadata={"source": url, "headers": headers, "status_code": 408}, + ) + except Exception as exc: + return Document( + page_content=str(exc), + metadata={"source": url, "headers": headers, "status_code": 500}, + ) def build( self, url: str, headers: Optional[dict] = None, + timeout: int = 5, ) -> Document: if headers is None: headers = {} if not isinstance(url, list): url = [url] - documents = [self.get_document(u, headers) for u in url] - self.repr_value = documents + with requests.Session() as session: + documents = [self.get_document(session, u, headers, timeout) for u in url] + self.repr_value = documents return documents From 4efe06e4409133f9450b18ec23a4a6cffec8e050 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 15:32:00 -0300 Subject: [PATCH 036/134] =?UTF-8?q?=F0=9F=90=9B=20fix(PostRequest.py):=20r?= =?UTF-8?q?emove=20redundant=20session=20creation=20and=20move=20it=20to?= =?UTF-8?q?=20the=20calling=20function=20to=20improve=20efficiency=20and?= =?UTF-8?q?=20reusability=20=E2=9C=A8=20feat(PostRequest.py):=20add=20supp?= =?UTF-8?q?ort=20for=20processing=20multiple=20documents=20in=20a=20single?= =?UTF-8?q?=20request=20to=20improve=20performance=20and=20reduce=20networ?= =?UTF-8?q?k=20overhead?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/utilities/PostRequest.py | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/src/backend/langflow/components/utilities/PostRequest.py b/src/backend/langflow/components/utilities/PostRequest.py index 2f0ab2053..b32c12488 100644 --- a/src/backend/langflow/components/utilities/PostRequest.py +++ b/src/backend/langflow/components/utilities/PostRequest.py @@ -23,29 +23,27 @@ class PostRequest(CustomComponent): def post_document( self, + session: requests.Session, document: Document, url: str, headers: Optional[dict] = None, ) -> Document: try: - with requests.Session() as session: - response = session.post( - url, headers=headers, data=document.page_content - ) - try: - response_json = response.json() - result = orjson_dumps(response_json, indent_2=False) - except Exception: - result = response.text - self.repr_value = result - return Document( - page_content=result, - metadata={ - "source": url, - "headers": headers, - "status_code": response, - }, - ) + response = session.post(url, headers=headers, data=document.page_content) + try: + response_json = response.json() + result = orjson_dumps(response_json, indent_2=False) + except Exception: + result = response.text + self.repr_value = result + return Document( + page_content=result, + metadata={ + "source": url, + "headers": headers, + "status_code": response, + }, + ) except Exception as exc: return Document( page_content=str(exc), @@ -67,6 +65,10 @@ class PostRequest(CustomComponent): if not isinstance(document, list): document = [document] - documents = [self.post_document(doc, url, headers) for doc in document] - self.repr_value = documents + + with requests.Session() as session: + documents = [ + self.post_document(session, doc, url, headers) for doc in document + ] + self.repr_value = documents return documents From 0d53db1653e126ece242df76fc068ba466e8181b Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 15:33:44 -0300 Subject: [PATCH 037/134] =?UTF-8?q?=F0=9F=90=9B=20fix(PostRequest.py):=20a?= =?UTF-8?q?dd=20validation=20for=20document=20parameter=20to=20only=20acce?= =?UTF-8?q?pt=20Document=20or=20list=20of=20Documents=20to=20prevent=20err?= =?UTF-8?q?ors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/components/utilities/PostRequest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/components/utilities/PostRequest.py b/src/backend/langflow/components/utilities/PostRequest.py index b32c12488..60a239d34 100644 --- a/src/backend/langflow/components/utilities/PostRequest.py +++ b/src/backend/langflow/components/utilities/PostRequest.py @@ -63,8 +63,10 @@ class PostRequest(CustomComponent): if headers is None: headers = {} - if not isinstance(document, list): + if not isinstance(document, list) and isinstance(document, Document): document = [document] + else: + raise ValueError("document must be a Document or a list of Documents") with requests.Session() as session: documents = [ From 8098cea4053e0fef77ddf2bf0cbc13c7485ec684 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 15:36:49 -0300 Subject: [PATCH 038/134] =?UTF-8?q?=F0=9F=90=9B=20fix(JSONDocumentBuilder.?= =?UTF-8?q?py):=20fix=20JSON=20serialization=20issue=20by=20using=20orjson?= =?UTF-8?q?=5Fdumps=20function=20=F0=9F=94=92=20chore(JSONDocumentBuilder.?= =?UTF-8?q?py):=20add=20type=20checking=20and=20raise=20TypeError=20for=20?= =?UTF-8?q?invalid=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/utilities/JSONDocumentBuilder.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/components/utilities/JSONDocumentBuilder.py b/src/backend/langflow/components/utilities/JSONDocumentBuilder.py index 4880200da..7cd41751f 100644 --- a/src/backend/langflow/components/utilities/JSONDocumentBuilder.py +++ b/src/backend/langflow/components/utilities/JSONDocumentBuilder.py @@ -13,6 +13,7 @@ from langflow import CustomComponent from langchain.schema import Document +from langflow.database.models.base import orjson_dumps class JSONDocumentBuilder(CustomComponent): @@ -34,9 +35,18 @@ class JSONDocumentBuilder(CustomComponent): documents = None if isinstance(document, list): documents = [ - Document(page_content={key: doc.page_content}) for doc in document + Document( + page_content=orjson_dumps({key: doc.page_content}, indent_2=False) + ) + for doc in document ] + elif isinstance(document, Document): + documents = Document( + page_content=orjson_dumps({key: document.page_content}, indent_2=False) + ) else: - documents = Document(page_content={key: document.page_content}) + raise TypeError( + f"Expected Document or list of Documents, got {type(document)}" + ) self.repr_value = documents return documents From 59652b887543b7830b0c78124c990433cec00ca1 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:11:10 -0300 Subject: [PATCH 039/134] =?UTF-8?q?=F0=9F=94=A7=20chore(prebuilt.py):=20im?= =?UTF-8?q?port=20missing=20JSON=5FPREFIX=20and=20JsonToolkit=20to=20fix?= =?UTF-8?q?=20unresolved=20references=20=F0=9F=94=A7=20chore(prebuilt.py):?= =?UTF-8?q?=20import=20missing=20JSON=5FPREFIX=20and=20JsonToolkit=20to=20?= =?UTF-8?q?fix=20unresolved=20references=20in=20prebuilt.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/interface/agents/prebuilt.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/interface/agents/prebuilt.py b/src/backend/langflow/interface/agents/prebuilt.py index 1c62918d9..5b81b7713 100644 --- a/src/backend/langflow/interface/agents/prebuilt.py +++ b/src/backend/langflow/interface/agents/prebuilt.py @@ -1,6 +1,7 @@ from langchain import LLMChain from langchain.agents import AgentExecutor, ZeroShotAgent -from langchain.agents.agent_toolkits.json.prompt import JSON_SUFFIX +from langchain.agents.agent_toolkits.json.prompt import JSON_PREFIX, JSON_SUFFIX +from langchain.agents.agent_toolkits.json.toolkit import JsonToolkit from langchain.agents.mrkl.prompt import FORMAT_INSTRUCTIONS from langchain.base_language import BaseLanguageModel From 6634e8864be090baed13e58fc93a03a1062c0bf1 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:11:24 -0300 Subject: [PATCH 040/134] =?UTF-8?q?=F0=9F=94=A7=20chore(vector=5Fstore.py)?= =?UTF-8?q?:=20import=20orjson=20library=20for=20JSON=20serialization=20an?= =?UTF-8?q?d=20deserialization=20=F0=9F=90=9B=20fix(vector=5Fstore.py):=20?= =?UTF-8?q?fix=20typo=20in=20function=20comment,=20change=20"OR"=20to=20"o?= =?UTF-8?q?r"=20for=20better=20readability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/interface/initialize/vector_store.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/backend/langflow/interface/initialize/vector_store.py b/src/backend/langflow/interface/initialize/vector_store.py index c8d8f0b02..233292626 100644 --- a/src/backend/langflow/interface/initialize/vector_store.py +++ b/src/backend/langflow/interface/initialize/vector_store.py @@ -11,6 +11,8 @@ from langchain.vectorstores import ( import os +import orjson + def docs_in_params(params: dict) -> bool: """Check if params has documents OR texts and one of them is not an empty list, From 39ae660e457de69bdaf21530caa630fd399b9a2e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:11:37 -0300 Subject: [PATCH 041/134] =?UTF-8?q?=F0=9F=94=A7=20chore(loading.py):=20add?= =?UTF-8?q?=20import=20statement=20for=20json=20module=20to=20fix=20missin?= =?UTF-8?q?g=20import=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/interface/initialize/loading.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/langflow/interface/initialize/loading.py b/src/backend/langflow/interface/initialize/loading.py index 6cb565e61..1cce109ab 100644 --- a/src/backend/langflow/interface/initialize/loading.py +++ b/src/backend/langflow/interface/initialize/loading.py @@ -1,3 +1,4 @@ +import json import orjson from typing import Any, Callable, Dict, Sequence, Type From 1dbe776e6adf5045943e409791a7d146b9a887a3 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:11:47 -0300 Subject: [PATCH 042/134] =?UTF-8?q?=E2=9C=A8=20feat(utils.py):=20add=20fun?= =?UTF-8?q?ction=20extract=5Finner=5Ftype=20to=20extract=20the=20inner=20t?= =?UTF-8?q?ype=20from=20a=20type=20hint=20that=20is=20a=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/interface/custom/utils.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/backend/langflow/interface/custom/utils.py diff --git a/src/backend/langflow/interface/custom/utils.py b/src/backend/langflow/interface/custom/utils.py new file mode 100644 index 000000000..99b0d4bc6 --- /dev/null +++ b/src/backend/langflow/interface/custom/utils.py @@ -0,0 +1,10 @@ +import re + + +def extract_inner_type(return_type: str) -> str: + """ + Extracts the inner type from a type hint that is a list. + """ + if match := re.match(r"list\[(.*)\]", return_type, re.IGNORECASE): + return match[1] + return return_type From 70f98f91508221ddddbfb07e2589b783e0f7df03 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:12:30 -0300 Subject: [PATCH 043/134] =?UTF-8?q?=F0=9F=90=9B=20fix(custom=5Fcomponent.p?= =?UTF-8?q?y):=20extract=20inner=20type=20from=20return=20type=20if=20it?= =?UTF-8?q?=20starts=20with=20'list'=20or=20'List'=20to=20handle=20list=20?= =?UTF-8?q?types=20correctly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/interface/custom/custom_component.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/backend/langflow/interface/custom/custom_component.py b/src/backend/langflow/interface/custom/custom_component.py index 4151f056d..e8747eac3 100644 --- a/src/backend/langflow/interface/custom/custom_component.py +++ b/src/backend/langflow/interface/custom/custom_component.py @@ -3,6 +3,7 @@ from fastapi import HTTPException from langflow.interface.custom.constants import CUSTOM_COMPONENT_SUPPORTED_TYPES from langflow.interface.custom.component import Component from langflow.interface.custom.directory_reader import DirectoryReader +from langflow.interface.custom.utils import extract_inner_type from langflow.utils import validate @@ -122,6 +123,10 @@ class CustomComponent(Component, extra=Extra.allow): return_type = build_method["return_type"] if not return_type: return [] + # If list or List is in the return type, then we remove it and return the inner type + if return_type.startswith("list") or return_type.startswith("List"): + return_type = extract_inner_type(return_type) + # If the return type is not a Union, then we just return it as a list if "Union" not in return_type: return [return_type] if return_type in self.return_type_valid_list else [] From 6fa2258aac30c39759250be146589df0ecaf3160 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:12:42 -0300 Subject: [PATCH 044/134] =?UTF-8?q?=F0=9F=94=A7=20chore(manager.py):=20imp?= =?UTF-8?q?ort=20orjson=20library=20for=20improved=20JSON=20serialization?= =?UTF-8?q?=20and=20deserialization=20performance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/chat/manager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/langflow/chat/manager.py b/src/backend/langflow/chat/manager.py index 24e2212b8..5cd833c10 100644 --- a/src/backend/langflow/chat/manager.py +++ b/src/backend/langflow/chat/manager.py @@ -12,6 +12,7 @@ import asyncio from typing import Any, Dict, List from langflow.cache.flow import InMemoryCache +import orjson class ChatHistory(Subject): From 05c8f5a0f8e19e86e9dd649e81f62d8f1952c8c1 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:13:07 -0300 Subject: [PATCH 045/134] =?UTF-8?q?=F0=9F=90=9B=20fix(GetRequest.py):=20up?= =?UTF-8?q?date=20orjson=5Fdumps=20function=20call=20to=20set=20indent=5F2?= =?UTF-8?q?=20parameter=20to=20False=20=F0=9F=90=9B=20fix(GetRequest.py):?= =?UTF-8?q?=20update=20return=20type=20annotation=20of=20get=5Fdocuments?= =?UTF-8?q?=20method=20to=20list[Document]=20=F0=9F=90=9B=20fix(PostReques?= =?UTF-8?q?t.py):=20update=20return=20type=20annotation=20of=20post=5Fdocu?= =?UTF-8?q?ment=20method=20to=20list[Document]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/components/utilities/GetRequest.py | 6 +++--- src/backend/langflow/components/utilities/PostRequest.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/langflow/components/utilities/GetRequest.py b/src/backend/langflow/components/utilities/GetRequest.py index 018b92751..40fe8935f 100644 --- a/src/backend/langflow/components/utilities/GetRequest.py +++ b/src/backend/langflow/components/utilities/GetRequest.py @@ -31,7 +31,7 @@ class GetRequest(CustomComponent): response = session.get(url, headers=headers, timeout=timeout) try: response_json = response.json() - result = orjson_dumps(response_json, indent=2) + result = orjson_dumps(response_json, indent_2=False) except Exception: result = response.text self.repr_value = result @@ -59,11 +59,11 @@ class GetRequest(CustomComponent): url: str, headers: Optional[dict] = None, timeout: int = 5, - ) -> Document: + ) -> list[Document]: if headers is None: headers = {} if not isinstance(url, list): - url = [url] + url: list[str] = [url] with requests.Session() as session: documents = [self.get_document(session, u, headers, timeout) for u in url] self.repr_value = documents diff --git a/src/backend/langflow/components/utilities/PostRequest.py b/src/backend/langflow/components/utilities/PostRequest.py index 60a239d34..e0687a6f7 100644 --- a/src/backend/langflow/components/utilities/PostRequest.py +++ b/src/backend/langflow/components/utilities/PostRequest.py @@ -59,12 +59,12 @@ class PostRequest(CustomComponent): document: Document, url: str, headers: Optional[dict] = None, - ) -> Document: + ) -> list[Document]: if headers is None: headers = {} if not isinstance(document, list) and isinstance(document, Document): - document = [document] + document: list[Document] = [document] else: raise ValueError("document must be a Document or a list of Documents") From 663e648af225ef6eca0ae5ce571c36aec247f283 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:15:02 -0300 Subject: [PATCH 046/134] =?UTF-8?q?=F0=9F=93=9D=20docs(utilities.mdx):=20u?= =?UTF-8?q?pdate=20documentation=20for=20GET=20and=20POST=20requests=20to?= =?UTF-8?q?=20reflect=20changes=20in=20the=20response=20format=20?= =?UTF-8?q?=F0=9F=93=9D=20docs(utilities.mdx):=20clarify=20that=20multiple?= =?UTF-8?q?=20URLs=20can=20be=20provided=20for=20GET=20requests=20and=20th?= =?UTF-8?q?e=20response=20will=20be=20a=20list=20of=20Documents?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs/components/utilities.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/docs/components/utilities.mdx b/docs/docs/components/utilities.mdx index cb0aa808e..573db78e7 100644 --- a/docs/docs/components/utilities.mdx +++ b/docs/docs/components/utilities.mdx @@ -16,12 +16,12 @@ Make a GET request to the given URL. **Params** -- **URL:** The URL to make the request to. +- **URL:** The URL to make the request to. There can be more than one URL, in which case the request will be made to each URL in order. - **Headers:** A dictionary of headers to send with the request. **Output** -- **Document:** The JSON response from the request as a Document. +- **List of Documents:** A list of Documents containing the JSON response from each request. ### POST Request @@ -48,4 +48,4 @@ Build a Document containing a JSON object using a key and another Document page **Output** -- **Document:** The Document containing the JSON object. +- **List of Documents:** A list containing the Document with the JSON object. From 938fcbab62a1f4300799d588c448d67b5fbbf31b Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:37:43 -0300 Subject: [PATCH 047/134] =?UTF-8?q?=F0=9F=90=9B=20fix(GetRequest.py):=20ch?= =?UTF-8?q?ange=20variable=20name=20'url'=20to=20'urls'=20to=20improve=20c?= =?UTF-8?q?larity=20and=20semantics=20=E2=9C=A8=20feat(PatchRequest.py):?= =?UTF-8?q?=20add=20new=20component=20'PatchRequest'=20to=20make=20PATCH?= =?UTF-8?q?=20requests=20to=20a=20given=20URL=20=F0=9F=90=9B=20fix(PostReq?= =?UTF-8?q?uest.py):=20change=20variable=20name=20'document'=20to=20'docum?= =?UTF-8?q?ents'=20to=20improve=20clarity=20and=20semantics?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/utilities/GetRequest.py | 5 +- .../components/utilities/PatchRequest.py | 76 +++++++++++++++++++ .../components/utilities/PostRequest.py | 8 +- 3 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 src/backend/langflow/components/utilities/PatchRequest.py diff --git a/src/backend/langflow/components/utilities/GetRequest.py b/src/backend/langflow/components/utilities/GetRequest.py index 40fe8935f..793d5b936 100644 --- a/src/backend/langflow/components/utilities/GetRequest.py +++ b/src/backend/langflow/components/utilities/GetRequest.py @@ -62,9 +62,8 @@ class GetRequest(CustomComponent): ) -> list[Document]: if headers is None: headers = {} - if not isinstance(url, list): - url: list[str] = [url] + urls = url if isinstance(url, list) else [url] with requests.Session() as session: - documents = [self.get_document(session, u, headers, timeout) for u in url] + documents = [self.get_document(session, u, headers, timeout) for u in urls] self.repr_value = documents return documents diff --git a/src/backend/langflow/components/utilities/PatchRequest.py b/src/backend/langflow/components/utilities/PatchRequest.py new file mode 100644 index 000000000..86fd2e1b4 --- /dev/null +++ b/src/backend/langflow/components/utilities/PatchRequest.py @@ -0,0 +1,76 @@ +from typing import List, Optional +import requests +from langflow import CustomComponent +from langchain.schema import Document +from langflow.database.models.base import orjson_dumps + + +class PatchRequest(CustomComponent): + display_name: str = "Patch Request" + description: str = "Make a PATCH request to the given URL." + output_types: list[str] = ["Document"] + beta = True + field_config = { + "url": {"display_name": "URL", "info": "The URL to make the request to."}, + "headers": { + "display_name": "Headers", + "field_type": "code", + "info": "The headers to send with the request.", + }, + "code": {"show": False}, + "document": {"display_name": "Document"}, + } + + def patch_document( + self, + session: requests.Session, + document: Document, + url: str, + headers: Optional[dict] = None, + ) -> Document: + try: + response = session.patch(url, headers=headers, data=document.page_content) + try: + response_json = response.json() + result = orjson_dumps(response_json, indent_2=False) + except Exception: + result = response.text + self.repr_value = result + return Document( + page_content=result, + metadata={ + "source": url, + "headers": headers, + "status_code": response.status_code, + }, + ) + except Exception as exc: + return Document( + page_content=str(exc), + metadata={"source": url, "headers": headers, "status_code": 500}, + ) + + def build( + self, + document: Document, + url: str, + headers: Optional[dict] = None, + ) -> List[Document]: + if headers is None: + headers = {} + + if not isinstance(document, list) and isinstance(document, Document): + documents: list[Document] = [document] + elif isinstance(document, list) and all( + isinstance(doc, Document) for doc in document + ): + documents = document + else: + raise ValueError("document must be a Document or a list of Documents") + + with requests.Session() as session: + documents = [ + self.patch_document(session, doc, url, headers) for doc in documents + ] + self.repr_value = documents + return documents diff --git a/src/backend/langflow/components/utilities/PostRequest.py b/src/backend/langflow/components/utilities/PostRequest.py index e0687a6f7..ab02f9412 100644 --- a/src/backend/langflow/components/utilities/PostRequest.py +++ b/src/backend/langflow/components/utilities/PostRequest.py @@ -64,13 +64,17 @@ class PostRequest(CustomComponent): headers = {} if not isinstance(document, list) and isinstance(document, Document): - document: list[Document] = [document] + documents: list[Document] = [document] + elif isinstance(document, list) and all( + isinstance(doc, Document) for doc in document + ): + documents = document else: raise ValueError("document must be a Document or a list of Documents") with requests.Session() as session: documents = [ - self.post_document(session, doc, url, headers) for doc in document + self.post_document(session, doc, url, headers) for doc in documents ] self.repr_value = documents return documents From fb7513f7cb9f612e20ecae64623a6c7a1764b694 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:37:53 -0300 Subject: [PATCH 048/134] =?UTF-8?q?=F0=9F=90=9B=20fix(custom=5Fcomponent.p?= =?UTF-8?q?y):=20change=20repr=5Fvalue=20type=20from=20str=20to=20Any=20to?= =?UTF-8?q?=20allow=20any=20type=20of=20value=20to=20be=20assigned?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/interface/custom/custom_component.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/langflow/interface/custom/custom_component.py b/src/backend/langflow/interface/custom/custom_component.py index e8747eac3..31f8433bc 100644 --- a/src/backend/langflow/interface/custom/custom_component.py +++ b/src/backend/langflow/interface/custom/custom_component.py @@ -20,7 +20,7 @@ class CustomComponent(Component, extra=Extra.allow): function_entrypoint_name = "build" function: Optional[Callable] = None return_type_valid_list = list(CUSTOM_COMPONENT_SUPPORTED_TYPES.keys()) - repr_value: Optional[str] = "" + repr_value: Optional[Any] = "" def __init__(self, **data): super().__init__(**data) From f69fddb1a0227011561c7d009a1daeca61b8ce68 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:42:09 -0300 Subject: [PATCH 049/134] =?UTF-8?q?=F0=9F=94=A7=20chore(settings.py):=20ad?= =?UTF-8?q?d=20missing=20import=20statement=20for=20json=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔧 chore(settings.py): remove unused import statement for contextlib module 🔧 chore(settings.py): remove unused import statement for orjson module 🔧 chore(settings.py): remove unused import statement for os module 🔧 chore(settings.py): remove unused import statement for typing module --- src/backend/langflow/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/langflow/settings.py b/src/backend/langflow/settings.py index 9eea696b4..521f2be77 100644 --- a/src/backend/langflow/settings.py +++ b/src/backend/langflow/settings.py @@ -1,4 +1,5 @@ import contextlib +import json import orjson import os from typing import Optional, List From b1779e849d90ca4a884ba3ad0991281be2005abb Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 16:46:57 -0300 Subject: [PATCH 050/134] =?UTF-8?q?=F0=9F=94=A5=20refactor(base.py):=20rem?= =?UTF-8?q?ove=20unused=20imports=20and=20code=20in=20base.py=20?= =?UTF-8?q?=F0=9F=94=A5=20refactor(base.py):=20remove=20unused=20variables?= =?UTF-8?q?=20and=20functions=20in=20base.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../langflow/services/settings/base.py | 222 ------------------ 1 file changed, 222 deletions(-) delete mode 100644 src/backend/langflow/services/settings/base.py diff --git a/src/backend/langflow/services/settings/base.py b/src/backend/langflow/services/settings/base.py deleted file mode 100644 index c8e4ec380..000000000 --- a/src/backend/langflow/services/settings/base.py +++ /dev/null @@ -1,222 +0,0 @@ -import contextlib -import orjson -import os -from shutil import copy2 -from typing import Optional, List -from pathlib import Path - -import yaml -from pydantic import BaseSettings, root_validator, validator -from langflow.utils.logger import logger - -# BASE_COMPONENTS_PATH = str(Path(__file__).parent / "components") -BASE_COMPONENTS_PATH = str(Path(__file__).parent.parent.parent / "components") - - -class Settings(BaseSettings): - CHAINS: dict = {} - AGENTS: dict = {} - PROMPTS: dict = {} - LLMS: dict = {} - TOOLS: dict = {} - MEMORIES: dict = {} - EMBEDDINGS: dict = {} - VECTORSTORES: dict = {} - DOCUMENTLOADERS: dict = {} - WRAPPERS: dict = {} - RETRIEVERS: dict = {} - TOOLKITS: dict = {} - TEXTSPLITTERS: dict = {} - UTILITIES: dict = {} - OUTPUT_PARSERS: dict = {} - CUSTOM_COMPONENTS: dict = {} - - # Define the default LANGFLOW_DIR - CONFIG_DIR: Optional[str] = None - - DEV: bool = False - DATABASE_URL: Optional[str] = None - CACHE: str = "InMemoryCache" - REMOVE_API_KEYS: bool = False - COMPONENTS_PATH: List[str] = [] - - @validator("CONFIG_DIR", pre=True, allow_reuse=True) - def set_langflow_dir(cls, value): - if not value: - import appdirs - - # Define the app name and author - app_name = "langflow" - app_author = "logspace" - - # Get the cache directory for the application - cache_dir = appdirs.user_cache_dir(app_name, app_author) - - # Create a .langflow directory inside the cache directory - value = Path(cache_dir) - value.mkdir(parents=True, exist_ok=True) - - if isinstance(value, str): - value = Path(value) - if not value.exists(): - value.mkdir(parents=True, exist_ok=True) - - return str(value) - - @validator("DATABASE_URL", pre=True) - def set_database_url(cls, value, values): - if not value: - logger.debug( - "No database_url provided, trying LANGFLOW_DATABASE_URL env variable" - ) - if langflow_database_url := os.getenv("LANGFLOW_DATABASE_URL"): - value = langflow_database_url - logger.debug("Using LANGFLOW_DATABASE_URL env variable.") - else: - logger.debug("No DATABASE_URL env variable, using sqlite database") - # Originally, we used sqlite:///./langflow.db - # so we need to migrate to the new format - # if there is a database in that location - if not values["CONFIG_DIR"]: - raise ValueError( - "CONFIG_DIR not set, please set it or provide a DATABASE_URL" - ) - - new_path = f"{values['CONFIG_DIR']}/langflow.db" - if Path("./langflow.db").exists(): - if Path(new_path).exists(): - logger.debug(f"Database already exists at {new_path}, using it") - else: - try: - logger.debug("Copying existing database to new location") - copy2("./langflow.db", new_path) - logger.debug(f"Copied existing database to {new_path}") - except Exception: - logger.error("Failed to copy database, using default path") - new_path = "./langflow.db" - - value = f"sqlite:///{new_path}" - - return value - - @validator("COMPONENTS_PATH", pre=True) - def set_components_path(cls, value): - if os.getenv("LANGFLOW_COMPONENTS_PATH"): - logger.debug("Adding LANGFLOW_COMPONENTS_PATH to components_path") - langflow_component_path = os.getenv("LANGFLOW_COMPONENTS_PATH") - if ( - Path(langflow_component_path).exists() - and langflow_component_path not in value - ): - if isinstance(langflow_component_path, list): - for path in langflow_component_path: - if path not in value: - value.append(path) - logger.debug( - f"Extending {langflow_component_path} to components_path" - ) - elif langflow_component_path not in value: - value.append(langflow_component_path) - logger.debug( - f"Appending {langflow_component_path} to components_path" - ) - - if not value: - value = [BASE_COMPONENTS_PATH] - logger.debug("Setting default components path to components_path") - elif BASE_COMPONENTS_PATH not in value: - value.append(BASE_COMPONENTS_PATH) - logger.debug("Adding default components path to components_path") - - logger.debug(f"Components path: {value}") - return value - - class Config: - validate_assignment = True - extra = "ignore" - env_prefix = "LANGFLOW_" - - @root_validator(allow_reuse=True) - def validate_lists(cls, values): - for key, value in values.items(): - if key != "dev" and not value: - values[key] = [] - return values - - def update_from_yaml(self, file_path: str, dev: bool = False): - new_settings = load_settings_from_yaml(file_path) - self.CHAINS = new_settings.CHAINS or {} - self.AGENTS = new_settings.AGENTS or {} - self.PROMPTS = new_settings.PROMPTS or {} - self.LLMS = new_settings.LLMS or {} - self.TOOLS = new_settings.TOOLS or {} - self.MEMORIES = new_settings.MEMORIES or {} - self.WRAPPERS = new_settings.WRAPPERS or {} - self.TOOLKITS = new_settings.TOOLKITS or {} - self.TEXTSPLITTERS = new_settings.TEXTSPLITTERS or {} - self.UTILITIES = new_settings.UTILITIES or {} - self.EMBEDDINGS = new_settings.EMBEDDINGS or {} - self.VECTORSTORES = new_settings.VECTORSTORES or {} - self.DOCUMENTLOADERS = new_settings.DOCUMENTLOADERS or {} - self.RETRIEVERS = new_settings.RETRIEVERS or {} - self.OUTPUT_PARSERS = new_settings.OUTPUT_PARSERS or {} - self.CUSTOM_COMPONENTS = new_settings.CUSTOM_COMPONENTS or {} - self.COMPONENTS_PATH = new_settings.COMPONENTS_PATH or [] - self.DEV = dev - - def update_settings(self, **kwargs): - logger.debug("Updating settings") - for key, value in kwargs.items(): - # value may contain sensitive information, so we don't want to log it - if not hasattr(self, key): - logger.debug(f"Key {key} not found in settings") - continue - logger.debug(f"Updating {key}") - if isinstance(getattr(self, key), list): - # value might be a '[something]' string - with contextlib.suppress(json.decoder.JSONDecodeError): - value = orjson.loads(str(value)) - if isinstance(value, list): - for item in value: - if isinstance(item, Path): - item = str(item) - if item not in getattr(self, key): - getattr(self, key).append(item) - logger.debug(f"Extended {key}") - else: - if isinstance(value, Path): - value = str(value) - if value not in getattr(self, key): - getattr(self, key).append(value) - logger.debug(f"Appended {key}") - - else: - setattr(self, key, value) - logger.debug(f"Updated {key}") - logger.debug(f"{key}: {getattr(self, key)}") - - -def save_settings_to_yaml(settings: Settings, file_path: str): - with open(file_path, "w") as f: - settings_dict = settings.dict() - yaml.dump(settings_dict, f) - - -def load_settings_from_yaml(file_path: str) -> Settings: - # Check if a string is a valid path or a file name - if "/" not in file_path: - # Get current path - current_path = os.path.dirname(os.path.abspath(__file__)) - - file_path = os.path.join(current_path, file_path) - - with open(file_path, "r") as f: - settings_dict = yaml.safe_load(f) - settings_dict = {k.upper(): v for k, v in settings_dict.items()} - - for key in settings_dict: - if key not in Settings.__fields__.keys(): - raise KeyError(f"Key {key} not found in settings") - logger.debug(f"Loading {len(settings_dict[key])} {key} from {file_path}") - - return Settings(**settings_dict) From 42a268a6789d4e7adeab139739df8ad27c4174af Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 17:35:20 -0300 Subject: [PATCH 051/134] =?UTF-8?q?=F0=9F=93=9D=20docs(components/utilitie?= =?UTF-8?q?s.mdx):=20add=20documentation=20for=20Update=20Request=20featur?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🚀 feat(UpdateRequest.py): add UpdateRequest component to make PATCH or PUT requests to a given URL --- docs/docs/components/utilities.mdx | 15 +++++++++++ .../{PatchRequest.py => UpdateRequest.py} | 27 +++++++++++++++---- 2 files changed, 37 insertions(+), 5 deletions(-) rename src/backend/langflow/components/utilities/{PatchRequest.py => UpdateRequest.py} (72%) diff --git a/docs/docs/components/utilities.mdx b/docs/docs/components/utilities.mdx index 573db78e7..1bd36e035 100644 --- a/docs/docs/components/utilities.mdx +++ b/docs/docs/components/utilities.mdx @@ -37,6 +37,21 @@ Make a POST request to the given URL. - **Document:** The JSON response from the request as a Document. +### Update Request + +Make a PATCH or PUT request to the given URL. + +**Params** + +- **URL:** The URL to make the request to. +- **Headers:** A dictionary of headers to send with the request. +- **Document:** The Document containing a JSON object to send with the request. +- **Method:** The HTTP method to use for the request. Can be either `PATCH` or `PUT`. + +**Output** + +- **Document:** The JSON response from the request as a Document. + ### JSON Document Builder Build a Document containing a JSON object using a key and another Document page content. diff --git a/src/backend/langflow/components/utilities/PatchRequest.py b/src/backend/langflow/components/utilities/UpdateRequest.py similarity index 72% rename from src/backend/langflow/components/utilities/PatchRequest.py rename to src/backend/langflow/components/utilities/UpdateRequest.py index 86fd2e1b4..0e2b5518c 100644 --- a/src/backend/langflow/components/utilities/PatchRequest.py +++ b/src/backend/langflow/components/utilities/UpdateRequest.py @@ -5,8 +5,8 @@ from langchain.schema import Document from langflow.database.models.base import orjson_dumps -class PatchRequest(CustomComponent): - display_name: str = "Patch Request" +class UpdateRequest(CustomComponent): + display_name: str = "Update Request" description: str = "Make a PATCH request to the given URL." output_types: list[str] = ["Document"] beta = True @@ -19,17 +19,32 @@ class PatchRequest(CustomComponent): }, "code": {"show": False}, "document": {"display_name": "Document"}, + "method": { + "display_name": "Method", + "field_type": "str", + "info": "The HTTP method to use.", + "options": ["PATCH", "PUT"], + "value": "PATCH", + }, } - def patch_document( + def update_document( self, session: requests.Session, document: Document, url: str, headers: Optional[dict] = None, + method: str = "PATCH", ) -> Document: try: - response = session.patch(url, headers=headers, data=document.page_content) + if method == "PATCH": + response = session.patch( + url, headers=headers, data=document.page_content + ) + elif method == "PUT": + response = session.put(url, headers=headers, data=document.page_content) + else: + raise ValueError(f"Unsupported method: {method}") try: response_json = response.json() result = orjson_dumps(response_json, indent_2=False) @@ -52,6 +67,7 @@ class PatchRequest(CustomComponent): def build( self, + method: str, document: Document, url: str, headers: Optional[dict] = None, @@ -70,7 +86,8 @@ class PatchRequest(CustomComponent): with requests.Session() as session: documents = [ - self.patch_document(session, doc, url, headers) for doc in documents + self.update_document(session, doc, url, headers, method) + for doc in documents ] self.repr_value = documents return documents From 7dc258d580a398f699b01063ea0e0ef9c4323c14 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 17:43:15 -0300 Subject: [PATCH 052/134] =?UTF-8?q?=F0=9F=93=9D=20docs(utilities.mdx):=20u?= =?UTF-8?q?pdate=20Utilities=20section=20in=20the=20sidebar=20to=20include?= =?UTF-8?q?=20the=20new=20"Utilities"=20page=20=F0=9F=93=9D=20docs(sidebar?= =?UTF-8?q?s.js):=20add=20"components/utilities"=20to=20the=20Components?= =?UTF-8?q?=20section=20in=20the=20sidebar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs/components/utilities.mdx | 10 +++++++++- docs/sidebars.js | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/docs/components/utilities.mdx b/docs/docs/components/utilities.mdx index 1bd36e035..87974d0bb 100644 --- a/docs/docs/components/utilities.mdx +++ b/docs/docs/components/utilities.mdx @@ -10,7 +10,11 @@ import Admonition from "@theme/Admonition";

-### Get Request +Utilities are a set of actions that can be used to perform common tasks in a flow. They are available in the **Utilities** section in the sidebar. + +--- + +### GET Request Make a GET request to the given URL. @@ -23,6 +27,8 @@ Make a GET request to the given URL. - **List of Documents:** A list of Documents containing the JSON response from each request. +--- + ### POST Request Make a POST request to the given URL. @@ -37,6 +43,8 @@ Make a POST request to the given URL. - **Document:** The JSON response from the request as a Document. +--- + ### Update Request Make a PATCH or PUT request to the given URL. diff --git a/docs/sidebars.js b/docs/sidebars.js index fbabab150..e44b1cf4f 100644 --- a/docs/sidebars.js +++ b/docs/sidebars.js @@ -42,6 +42,7 @@ module.exports = { "components/text-splitters", "components/toolkits", "components/tools", + "components/utilities", "components/vector-stores", "components/wrappers", ], From c22a792a7f2edd2fc3b2d7fd1d73c339b6e5b109 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 17:45:45 -0300 Subject: [PATCH 053/134] =?UTF-8?q?=F0=9F=93=9A=20docs(GetRequest.py):=20a?= =?UTF-8?q?dd=20documentation=20link=20for=20the=20GET=20Request=20compone?= =?UTF-8?q?nt=20=F0=9F=93=9A=20docs(JSONDocumentBuilder.py):=20add=20docum?= =?UTF-8?q?entation=20link=20for=20the=20JSON=20Document=20Builder=20compo?= =?UTF-8?q?nent=20=F0=9F=93=9A=20docs(PostRequest.py):=20add=20documentati?= =?UTF-8?q?on=20link=20for=20the=20POST=20Request=20component=20?= =?UTF-8?q?=F0=9F=93=9A=20docs(UpdateRequest.py):=20add=20documentation=20?= =?UTF-8?q?link=20for=20the=20Update=20Request=20component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/components/utilities/GetRequest.py | 3 ++- .../langflow/components/utilities/JSONDocumentBuilder.py | 3 +++ src/backend/langflow/components/utilities/PostRequest.py | 1 + src/backend/langflow/components/utilities/UpdateRequest.py | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/components/utilities/GetRequest.py b/src/backend/langflow/components/utilities/GetRequest.py index 793d5b936..2b76d2ed8 100644 --- a/src/backend/langflow/components/utilities/GetRequest.py +++ b/src/backend/langflow/components/utilities/GetRequest.py @@ -6,9 +6,10 @@ from typing import Optional class GetRequest(CustomComponent): - display_name: str = "Get Request" + display_name: str = "GET Request" description: str = "Make a GET request to the given URL." output_types: list[str] = ["Document"] + documentation: str = "https://docs.langflow.org/components/utilities#get-request" beta = True field_config = { "url": { diff --git a/src/backend/langflow/components/utilities/JSONDocumentBuilder.py b/src/backend/langflow/components/utilities/JSONDocumentBuilder.py index 7cd41751f..e41b6b6af 100644 --- a/src/backend/langflow/components/utilities/JSONDocumentBuilder.py +++ b/src/backend/langflow/components/utilities/JSONDocumentBuilder.py @@ -21,6 +21,9 @@ class JSONDocumentBuilder(CustomComponent): description: str = "Build a Document containing a JSON object using a key and another Document page content." output_types: list[str] = ["Document"] beta = True + documentation: str = ( + "https://docs.langflow.org/components/utilities#json-document-builder" + ) field_config = { "key": {"display_name": "Key"}, diff --git a/src/backend/langflow/components/utilities/PostRequest.py b/src/backend/langflow/components/utilities/PostRequest.py index ab02f9412..88dd1eba6 100644 --- a/src/backend/langflow/components/utilities/PostRequest.py +++ b/src/backend/langflow/components/utilities/PostRequest.py @@ -9,6 +9,7 @@ class PostRequest(CustomComponent): display_name: str = "Post Request" description: str = "Make a POST request to the given URL." output_types: list[str] = ["Document"] + documentation: str = "https://docs.langflow.org/components/utilities#post-request" beta = True field_config = { "url": {"display_name": "URL", "info": "The URL to make the request to."}, diff --git a/src/backend/langflow/components/utilities/UpdateRequest.py b/src/backend/langflow/components/utilities/UpdateRequest.py index 0e2b5518c..569dac013 100644 --- a/src/backend/langflow/components/utilities/UpdateRequest.py +++ b/src/backend/langflow/components/utilities/UpdateRequest.py @@ -9,6 +9,7 @@ class UpdateRequest(CustomComponent): display_name: str = "Update Request" description: str = "Make a PATCH request to the given URL." output_types: list[str] = ["Document"] + documentation: str = "https://docs.langflow.org/components/utilities#update-request" beta = True field_config = { "url": {"display_name": "URL", "info": "The URL to make the request to."}, From 4f2a14bed5cac455246ab5bcda223ac857671610 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 17:46:07 -0300 Subject: [PATCH 054/134] =?UTF-8?q?=F0=9F=93=9D=20docs(utilities.mdx):=20a?= =?UTF-8?q?dd=20horizontal=20rule=20to=20improve=20readability=20and=20sep?= =?UTF-8?q?aration=20of=20content=20=F0=9F=93=9D=20docs(utilities.mdx):=20?= =?UTF-8?q?add=20description=20for=20JSON=20Document=20Builder=20to=20prov?= =?UTF-8?q?ide=20clarity=20on=20its=20purpose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs/components/utilities.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/docs/components/utilities.mdx b/docs/docs/components/utilities.mdx index 87974d0bb..593864213 100644 --- a/docs/docs/components/utilities.mdx +++ b/docs/docs/components/utilities.mdx @@ -60,6 +60,8 @@ Make a PATCH or PUT request to the given URL. - **Document:** The JSON response from the request as a Document. +--- + ### JSON Document Builder Build a Document containing a JSON object using a key and another Document page content. From c6fc60d4b2951b1d074a24a0c142d04046b9cea6 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 17:52:17 -0300 Subject: [PATCH 055/134] =?UTF-8?q?=F0=9F=94=A7=20chore(GetRequest.py):=20?= =?UTF-8?q?add=20timeout=20parameter=20to=20the=20GetRequest=20component?= =?UTF-8?q?=20for=20configurable=20request=20timeout=20=F0=9F=93=9D=20docs?= =?UTF-8?q?(GetRequest.py):=20update=20component=20documentation=20to=20in?= =?UTF-8?q?clude=20information=20about=20the=20new=20timeout=20parameter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/components/utilities/GetRequest.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/backend/langflow/components/utilities/GetRequest.py b/src/backend/langflow/components/utilities/GetRequest.py index 2b76d2ed8..0a819fd38 100644 --- a/src/backend/langflow/components/utilities/GetRequest.py +++ b/src/backend/langflow/components/utilities/GetRequest.py @@ -23,6 +23,12 @@ class GetRequest(CustomComponent): "info": "The headers to send with the request.", }, "code": {"show": False}, + "timeout": { + "display_name": "Timeout", + "field_type": "int", + "info": "The timeout to use for the request.", + "value": 5, + }, } def get_document( From cea4063637cbbbb96c7e54eec9633a7868d14987 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 17:53:55 -0300 Subject: [PATCH 056/134] =?UTF-8?q?=F0=9F=90=9B=20fix(GetRequest.py):=20co?= =?UTF-8?q?nvert=20timeout=20to=20integer=20to=20avoid=20potential=20type?= =?UTF-8?q?=20errors=20=E2=9C=A8=20feat(PostRequest.py):=20update=20displa?= =?UTF-8?q?y=20name=20to=20"POST=20Request"=20for=20better=20clarity=20and?= =?UTF-8?q?=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/components/utilities/GetRequest.py | 2 +- src/backend/langflow/components/utilities/PostRequest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/components/utilities/GetRequest.py b/src/backend/langflow/components/utilities/GetRequest.py index 0a819fd38..c8182ad0d 100644 --- a/src/backend/langflow/components/utilities/GetRequest.py +++ b/src/backend/langflow/components/utilities/GetRequest.py @@ -35,7 +35,7 @@ class GetRequest(CustomComponent): self, session: requests.Session, url: str, headers: Optional[dict], timeout: int ) -> Document: try: - response = session.get(url, headers=headers, timeout=timeout) + response = session.get(url, headers=headers, timeout=int(timeout)) try: response_json = response.json() result = orjson_dumps(response_json, indent_2=False) diff --git a/src/backend/langflow/components/utilities/PostRequest.py b/src/backend/langflow/components/utilities/PostRequest.py index 88dd1eba6..9d5ab504f 100644 --- a/src/backend/langflow/components/utilities/PostRequest.py +++ b/src/backend/langflow/components/utilities/PostRequest.py @@ -6,7 +6,7 @@ from typing import Optional class PostRequest(CustomComponent): - display_name: str = "Post Request" + display_name: str = "POST Request" description: str = "Make a POST request to the given URL." output_types: list[str] = ["Document"] documentation: str = "https://docs.langflow.org/components/utilities#post-request" From 54fd3d57054feaf13ec2fae532e645ed0bc87349 Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Tue, 22 Aug 2023 18:20:04 -0300 Subject: [PATCH 057/134] =?UTF-8?q?=F0=9F=94=A7=20fix(headerComponent):=20?= =?UTF-8?q?remove=20unused=20imports=20and=20function=20call=20to=20improv?= =?UTF-8?q?e=20code=20cleanliness=20and=20performance=20=E2=9C=A8=20feat(h?= =?UTF-8?q?eaderComponent):=20remove=20conditional=20rendering=20for=20api?= =?UTF-8?q?=20keys=20button=20to=20always=20display=20it=20in=20the=20head?= =?UTF-8?q?er=20=F0=9F=94=A7=20fix(ApiKeysPage):=20add=20missing=20import?= =?UTF-8?q?=20for=20Header=20component=20to=20fix=20compilation=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/headerComponent/index.tsx | 26 +++++++++---------- src/frontend/src/pages/ApiKeysPage/index.tsx | 3 +++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/frontend/src/components/headerComponent/index.tsx b/src/frontend/src/components/headerComponent/index.tsx index a9c91ebea..33fcaf58e 100644 --- a/src/frontend/src/components/headerComponent/index.tsx +++ b/src/frontend/src/components/headerComponent/index.tsx @@ -1,4 +1,4 @@ -import { useContext, useEffect, useState } from "react"; +import { useContext } from "react"; import { FaDiscord, FaGithub, FaTwitter } from "react-icons/fa"; import { Link, useLocation, useNavigate } from "react-router-dom"; import AlertDropdown from "../../alerts/alertDropDown"; @@ -7,7 +7,6 @@ import { alertContext } from "../../contexts/alertContext"; import { AuthContext } from "../../contexts/authContext"; import { darkContext } from "../../contexts/darkContext"; import { TabsContext } from "../../contexts/tabsContext"; -import { getRepoStars } from "../../controllers/API"; import IconComponent from "../genericIconComponent"; import { Button } from "../ui/button"; import { Separator } from "../ui/separator"; @@ -128,18 +127,17 @@ export default function Header(): JSX.Element { /> - {!autoLogin && ( - - )} + + diff --git a/src/frontend/src/pages/ApiKeysPage/index.tsx b/src/frontend/src/pages/ApiKeysPage/index.tsx index 37e148caa..852d898b1 100644 --- a/src/frontend/src/pages/ApiKeysPage/index.tsx +++ b/src/frontend/src/pages/ApiKeysPage/index.tsx @@ -18,6 +18,7 @@ import SecretKeyModal from "../../modals/SecretKeyModal"; import moment from "moment"; import { ApiKey } from "../../types/components"; +import Header from "../../components/headerComponent"; export default function ApiKeysPage() { const [loadingKeys, setLoadingKeys] = useState(true); @@ -80,6 +81,8 @@ export default function ApiKeysPage() { return ( <> +
+ {userData && (
From f0d0909764f128f714b235a9d2a6efe609537a8c Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 22 Aug 2023 18:23:15 -0300 Subject: [PATCH 058/134] =?UTF-8?q?=F0=9F=94=96=20chore(pyproject.toml):?= =?UTF-8?q?=20bump=20version=20from=200.4.12=20to=200.4.13=20for=20langflo?= =?UTF-8?q?w=20package?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poetry.lock | 426 +++++++++++++++++++++++++------------------------ pyproject.toml | 2 +- 2 files changed, 217 insertions(+), 211 deletions(-) diff --git a/poetry.lock b/poetry.lock index a9b60719f..186eb4128 100644 --- a/poetry.lock +++ b/poetry.lock @@ -650,81 +650,80 @@ click = "*" [[package]] name = "clickhouse-connect" -version = "0.6.8" +version = "0.6.9" description = "ClickHouse Database Core Driver for Python, Pandas, and Superset" optional = false python-versions = "~=3.7" files = [ - {file = "clickhouse-connect-0.6.8.tar.gz", hash = "sha256:a8729f4f100f891d058944342d9a0838f4a51bd91504af6b6af106a01aa08426"}, - {file = "clickhouse_connect-0.6.8-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8155c2a976d2de82a3df526dc980b77a07e815353f67e9bf49c15e09faa8b620"}, - {file = "clickhouse_connect-0.6.8-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:068244b05ea155a6cf6a6b4379b39c078f70659480366a152161f3235444dd4e"}, - {file = "clickhouse_connect-0.6.8-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a4f3d53a3c49002c57590abd17e616374559f3fa4c96d1aaf9500aef7655879a"}, - {file = "clickhouse_connect-0.6.8-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e28e4e0e70433c3339a945d73c219f58fcf7b58481ff6f3077da0ae20a295d0"}, - {file = "clickhouse_connect-0.6.8-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:783cf21680c37b1fc2e48859ae4ba7cab8d648d36d466d936645e2a27ffb2050"}, - {file = "clickhouse_connect-0.6.8-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97844fd19faacf135c56c43d3f1b8493840c9e283931ba0773931a9505b62da4"}, - {file = "clickhouse_connect-0.6.8-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:286c97ff8dd0a32cde48fe1b7024b483bf900038620441a019647f25c1928c0c"}, - {file = "clickhouse_connect-0.6.8-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:49ee463569d6f9f92e2ed83ab843e139d07ae87fb477956cd7659c1458ac2360"}, - {file = "clickhouse_connect-0.6.8-cp310-cp310-win32.whl", hash = "sha256:a0ed55deccdae2d9b2ce545b0c1b554389bb89f03dc4afd7ee0cc0ddb26acb22"}, - {file = "clickhouse_connect-0.6.8-cp310-cp310-win_amd64.whl", hash = "sha256:4bf40ea3d41d75421e2f489894e14b7a5cd2bf4000bbb927364e4b43066d2595"}, - {file = "clickhouse_connect-0.6.8-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5646f7eee3609da6277d2dc8ccb4be16959b5e4959bb408eb52eed628b4e29f2"}, - {file = "clickhouse_connect-0.6.8-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8b2c9be52670222231e3b7284267121568ab15fb6d48f163695fa26c5ebaf193"}, - {file = "clickhouse_connect-0.6.8-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:675f02e3fb586172da9d7231d0c10a10c47b8063b0f43fce04719d03584ac55e"}, - {file = "clickhouse_connect-0.6.8-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a48301444f5f0931a51ec9c0b8b7458a4ba6ddb9128c352102bbe869c96a3ba0"}, - {file = "clickhouse_connect-0.6.8-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:03233693f9d2a38bd781786a8b6a435df9e2c2d85d1a6f84bcc21ecd32c87b84"}, - {file = "clickhouse_connect-0.6.8-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:c6b136213d042262a2257ba2db3a9a091c465a2535311172be0e87f0c66653b5"}, - {file = "clickhouse_connect-0.6.8-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:c96c69570d17b83b45c9e14fd1a92be4d180b3accb52539d1333ff4bff4d1f7b"}, - {file = "clickhouse_connect-0.6.8-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:86fc223b2e84c7eb7d4e6082f81a1304164c32112db9a8e41720b1077d53e206"}, - {file = "clickhouse_connect-0.6.8-cp311-cp311-win32.whl", hash = "sha256:529a35e03069b4d31b1624506021e804c26907ae1faa2753678590414681c37f"}, - {file = "clickhouse_connect-0.6.8-cp311-cp311-win_amd64.whl", hash = "sha256:4f7d84456939eec83d0670050ed00c84ef11ff6f1d15e1151d9cfbed4094218c"}, - {file = "clickhouse_connect-0.6.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4eeb30c4a5a2e404eece76891baa4554ee85cc34e17d9714f8da79df4c162abe"}, - {file = "clickhouse_connect-0.6.8-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:610f4946495acf1fc465e882e006c8076344cbdd0b0f34a10b113c9a2adc49fb"}, - {file = "clickhouse_connect-0.6.8-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fc87597bc68e0d9b8cb322e47e427423565e9a774de0fe080611001d7cd1f657"}, - {file = "clickhouse_connect-0.6.8-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0672dcf6c75aeea7a20104538dcaecc4a10915b83e1eb2f0bafa2922368b7e8c"}, - {file = "clickhouse_connect-0.6.8-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:190b2b7de1b15506dd5c7c34df403bd5cde94dc4c98f082ab6f1453475af5efc"}, - {file = "clickhouse_connect-0.6.8-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a1ba4dbd0ce87a6e430b834e6790f00c21a9a5a49587b834ee94e93c42a83891"}, - {file = "clickhouse_connect-0.6.8-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:fcca53c9b186c5d18ccbeb3e90bb58e6c7777c7eb22ea5166da2f83661b595a7"}, - {file = "clickhouse_connect-0.6.8-cp37-cp37m-win32.whl", hash = "sha256:07350c635ddbd21cc4680401680436a360f6182e3fa2b8b9da6cecd2104acd28"}, - {file = "clickhouse_connect-0.6.8-cp37-cp37m-win_amd64.whl", hash = "sha256:4ec1e5f4cb1e276f6f885695466ec53664cb6d6749c4f214778f746cd4c169c4"}, - {file = "clickhouse_connect-0.6.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e195d7cbb0305df40fce6d3b16d556c2eccc166807d19f49b76730ad6cab9ac6"}, - {file = "clickhouse_connect-0.6.8-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1fe67217d369e30c446d7998186d6bedfab0ef6ad41c63bc4a65cd5c16b11e7c"}, - {file = "clickhouse_connect-0.6.8-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:05bd58f417a98061e4d4dff2238a1d0b80f0c1c54e489cfb37b6ac0f55a5117d"}, - {file = "clickhouse_connect-0.6.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:715acb48161687cf860b6244d064646d90069d9ed6705d4e71c07ee54a98ede1"}, - {file = "clickhouse_connect-0.6.8-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7c05c2fefb326c49d798f1adce99a30fc25804311c0adbb6537a08bd7b9fb4a6"}, - {file = "clickhouse_connect-0.6.8-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ba6335faec2a0525d14bc5dfc8268924878d5219831acd51ca88ef69b9d4186f"}, - {file = "clickhouse_connect-0.6.8-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d3122339282e41dc863c1d2ad6f812424aba9023a5733cfe5e801b02b36e2596"}, - {file = "clickhouse_connect-0.6.8-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:397f803dfe502329be9ac209ac55a7229ee6bd81d0e9291faf77ae4c86f1d99c"}, - {file = "clickhouse_connect-0.6.8-cp38-cp38-win32.whl", hash = "sha256:0136a99842694219c3b1dbb3f6baf0866112b7ffa6a5c9109fef1b891a788467"}, - {file = "clickhouse_connect-0.6.8-cp38-cp38-win_amd64.whl", hash = "sha256:4340e4d62119ea56c2cbd15673813fe99be8c9de1af96e593ca3b42113a9ae4f"}, - {file = "clickhouse_connect-0.6.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:64c9f52ce8eec80ab6958702ea910904723e228dc26a63be89b621aa7af80aec"}, - {file = "clickhouse_connect-0.6.8-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5169c22b0765ef52d7498108df0f9158da05c35342fc60ba3c6527d9fe6d15f3"}, - {file = "clickhouse_connect-0.6.8-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f324a827c6c3c56a651dd5f2c33cdd74c6cea16e4237cb2638a89aefc9bccb"}, - {file = "clickhouse_connect-0.6.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:91e9f9ddb8adeaa6996cd3aa97cbb72b5cc69769d59419cf3a65f5d654af1e92"}, - {file = "clickhouse_connect-0.6.8-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09f83ceef6ced6a9a44a3e74c0904cfc5c5f25e563cabc46b922051f4b1e0bf8"}, - {file = "clickhouse_connect-0.6.8-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6fae23b60e1653efa03abd850b3b36fdf5c930b5b37a7f70ced2a1f164a11f51"}, - {file = "clickhouse_connect-0.6.8-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:4203aa258cd396716d3acdebfa405f849dae83e162dad22b3ce326e54e4cfa92"}, - {file = "clickhouse_connect-0.6.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bf094318639675d02068dbb93299507694c0f4d66dcb530084044a877e547c83"}, - {file = "clickhouse_connect-0.6.8-cp39-cp39-win32.whl", hash = "sha256:28d4022ac7db92a2c405a55e6bfffdfd9afdda2075c5a906ac1ea42d24e95e8d"}, - {file = "clickhouse_connect-0.6.8-cp39-cp39-win_amd64.whl", hash = "sha256:5754e2b12645ab18d4afde101391beb019685b0d0c1b5717733ba8d91fc942cf"}, - {file = "clickhouse_connect-0.6.8-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:160fb485ce6c280c7e30fbc8a2a33e6ecb663e24db43242ad555901e363ef613"}, - {file = "clickhouse_connect-0.6.8-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f660664341ab6f93f61d7245e3983f41fc7bf06520ce44088431d5e48713a8e1"}, - {file = "clickhouse_connect-0.6.8-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99f66263e8014c6c1ba657cfe408c39c9f178c257d159158c7f4a12f4379312a"}, - {file = "clickhouse_connect-0.6.8-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:050681b8ad33fc3210461a6b5e396cca8b202944ef24c436094202702ae84be7"}, - {file = "clickhouse_connect-0.6.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:342be4094746bb068496555a3d9ecf4f67574b7bcf9c57a39f76700a7155cc13"}, - {file = "clickhouse_connect-0.6.8-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d956358c9966006b246f450146c816d198972c19531e69e02d3fc8f3fac8b5a2"}, - {file = "clickhouse_connect-0.6.8-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8def8771307ee5b964dcf9436c3a4dfca46618df72bbf9e73c7882c05812e481"}, - {file = "clickhouse_connect-0.6.8-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e05f0504edddfae4a08d4c8ceb2e263982b3d2b453fc54b8c9fa9db1c3ad47a"}, - {file = "clickhouse_connect-0.6.8-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f45986e195cd9352ffab5116df488f21e790c3b33e3ce79910a70730aa90f5bc"}, - {file = "clickhouse_connect-0.6.8-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:3c7fde400669245efa572cf0810c4c0a4ca6bb05d6c787a84472a4f958207770"}, - {file = "clickhouse_connect-0.6.8-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:2830d1f1b58904c4f1100315345d0e54fd5ed5346b391b25d82b1a0b695c266a"}, - {file = "clickhouse_connect-0.6.8-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a8f055198176252a8298497f05420aa5b7b3d099d77a72b0b25398630303004a"}, - {file = "clickhouse_connect-0.6.8-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5f90b135933cb4297bc67b3d74e3bca57bad80a430883ef2aabf50f985820be3"}, - {file = "clickhouse_connect-0.6.8-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e87ffc88ebda5cab7fb4de8c832d155f9e50e4f18c43ed44e2c058449b6370ab"}, - {file = "clickhouse_connect-0.6.8-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:691a12359f88431bbe6c743dab62ef330b3a6dde0aa88b7fa3b332265ee25a8e"}, + {file = "clickhouse-connect-0.6.9.tar.gz", hash = "sha256:ba735bcb73c4743788e7c8bfeb865edd887da28a253bd189c449df20d9abff64"}, + {file = "clickhouse_connect-0.6.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:74fb1bc9eea037db1361d75adb6482ce6d8c22e4a47a37735edd8e3862d931f7"}, + {file = "clickhouse_connect-0.6.9-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fb5e4a489b5960fc4bc48fdda052b3a446a736ee4be74105ae7663307da8a063"}, + {file = "clickhouse_connect-0.6.9-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e954bfe759fd437595732a15a40356e9e29035a83f485a23601f863aab2f7c6f"}, + {file = "clickhouse_connect-0.6.9-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e2f4ada702a933f2ffc38e77bf948f11d745f3467191d6b6fc2190683d02bb8"}, + {file = "clickhouse_connect-0.6.9-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:34d06a56e2be745adb692fbf1eedd9fb6d5dbb46ce325c1d9e57b53ba99eee95"}, + {file = "clickhouse_connect-0.6.9-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5dcbd145ad907e9bc7dbbc5e80440888201de8f1622f755032595c8b8302e4ef"}, + {file = "clickhouse_connect-0.6.9-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f155d1f214c81c5d8e72cbe325dfec72340c082156108db06c862ddd76771d7e"}, + {file = "clickhouse_connect-0.6.9-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0b47ec963b9d9cf1674490385183dc988d6e4d33287bb9d81e23373012232223"}, + {file = "clickhouse_connect-0.6.9-cp310-cp310-win32.whl", hash = "sha256:59dc14e47fa287578495835e4c5efdff90e40430b5b27a3c1453bb83d65e17cb"}, + {file = "clickhouse_connect-0.6.9-cp310-cp310-win_amd64.whl", hash = "sha256:bcabfaa3fbef4ea9ba723d16e9f50e5e02a3c871b3afc8106b6a04a53a7b19d7"}, + {file = "clickhouse_connect-0.6.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:93025ec43ffc25ae3e5111c0da65f8227dc6ae68834beeda3b0256c22baedd9f"}, + {file = "clickhouse_connect-0.6.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ac72323af794b4c79a804f4f311cfe4ae28426f92ac1b7f390aabbab6a93a4bd"}, + {file = "clickhouse_connect-0.6.9-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d8c1e71b34e870d8cd4805c3be86678e19a63931a718f3bf657b48da82c74df"}, + {file = "clickhouse_connect-0.6.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c286a6814facf3fa5bf492863e99b300154b33c3ecedf7799070ef9b8cd12474"}, + {file = "clickhouse_connect-0.6.9-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f9924d53302f3333bcc40b9f5238bea4c29c107a6a82e22dc5ba24ce7c1cdb75"}, + {file = "clickhouse_connect-0.6.9-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:adf29b7319e5cdb9b6cb8ec3d4e85056e588ac51265b92ffaf6c69481283e643"}, + {file = "clickhouse_connect-0.6.9-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:6fc2d4e428af2be8c9db23b37f4493848696417376f0eaba23b0e8f053f6a0d4"}, + {file = "clickhouse_connect-0.6.9-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:b3793d26cabd88bad6f4a3fe9f93974e480cc785f137158be8b58d700baaeb4f"}, + {file = "clickhouse_connect-0.6.9-cp311-cp311-win32.whl", hash = "sha256:1fa2fddd00d019b4593b194a303339268699808c5ebeab2d331b2ee0d29eabc0"}, + {file = "clickhouse_connect-0.6.9-cp311-cp311-win_amd64.whl", hash = "sha256:536df34ecb49ddd7c61ebd6b900a7d06b3a246fbe30441cb68c568ea42e292d3"}, + {file = "clickhouse_connect-0.6.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d61337ca4c48b78a959627e9c0de58b86a8399510de184bd6d4c27b8b7e93c17"}, + {file = "clickhouse_connect-0.6.9-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69449ee694ed9aa4ee5f290c13ce5038efe394ff99b43eeee8e8190f3e4aa909"}, + {file = "clickhouse_connect-0.6.9-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b97ee1de55fea90f12e1f04ea6521dd827f2ed25361cfb99374cb0649222a8f0"}, + {file = "clickhouse_connect-0.6.9-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:adc42d8970b322bf78053a62e6c555fd8e03b29aecffe21521efaf5bad4e2ba4"}, + {file = "clickhouse_connect-0.6.9-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:064a27bd8d92f413ddcf20926a6c868a0482f7e757f9d412c0778b875d20c536"}, + {file = "clickhouse_connect-0.6.9-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a4aaf279efc5e8e13c6b4ac7ce41a3700f786dd34a58d3686ddf29660364dc62"}, + {file = "clickhouse_connect-0.6.9-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:022e0438728cc323d1817ade5105e4458acf71be822dffee130934140524fcbd"}, + {file = "clickhouse_connect-0.6.9-cp37-cp37m-win32.whl", hash = "sha256:e7a9c511f680e0f40b8765e7fbb8bde6b101cbf0a5b180f6ccc18ad59c9776ea"}, + {file = "clickhouse_connect-0.6.9-cp37-cp37m-win_amd64.whl", hash = "sha256:c2bd8fc5767fd883d5d1ca2e35e3034e590994ea64f76b11a3814ab20862a0b0"}, + {file = "clickhouse_connect-0.6.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:159cba55d55ea85cea310a8781144559deade5c8cee6b13bc720253e6a6e4a5c"}, + {file = "clickhouse_connect-0.6.9-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f4a34a7e3d16c0e4c34a11b7d8cbd633f22ee48e1a193f1977f64fe470ad9c79"}, + {file = "clickhouse_connect-0.6.9-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:026b9363553a6bd22f5c9f4b65cacd3c3fc0b50d5d0159c47bb34f63dc87ccff"}, + {file = "clickhouse_connect-0.6.9-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aaec4e9dc5110bf6f17a0abbb61e286293400d2c3450e29040fd100dc075dc89"}, + {file = "clickhouse_connect-0.6.9-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0224509fd36637ccf1add66f4ec12d464e2e80e4a5521e846f4d7602b6664a0c"}, + {file = "clickhouse_connect-0.6.9-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:0aa5b9b5699ae385d4f7c1f493e1029d7803b47c74ecb2502f01fb79135253d2"}, + {file = "clickhouse_connect-0.6.9-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1b0418b347f4e7a27e692f6947b9788759b23ee4f4aabccbb376b5241190f8a7"}, + {file = "clickhouse_connect-0.6.9-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:80778a118f5b2c52daf64c051fdbc5df23a8c37e9e385205e4942fdd60925d25"}, + {file = "clickhouse_connect-0.6.9-cp38-cp38-win32.whl", hash = "sha256:841838e793cd4283d3a245e278b136ea5681e636dcdc816c27c4ff77e4bb2077"}, + {file = "clickhouse_connect-0.6.9-cp38-cp38-win_amd64.whl", hash = "sha256:63de88cf244adda961742c1e05e051340de09714b38cc33d757138af6033b364"}, + {file = "clickhouse_connect-0.6.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:47216788f28fa8d1c225acdd366f5eab53c00b131ca246c7f004d94b1aff7cef"}, + {file = "clickhouse_connect-0.6.9-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e8b6669ba538b6fe18cbe01f4451c4e5d5674471cd55aec7af3d6f1a8e064b8f"}, + {file = "clickhouse_connect-0.6.9-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43de9421a8f91e82efec5f9bffe366fb341e2fb7c7dce89e303061ba7065baa3"}, + {file = "clickhouse_connect-0.6.9-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:62b184813807112a8ef2853df93b6c07899bdf04f188e547f92c54fc2e056be3"}, + {file = "clickhouse_connect-0.6.9-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5c869d6761f38bfb940fa0992078bd7d8ece1c1c47a330ab3e8390ca8b2ba980"}, + {file = "clickhouse_connect-0.6.9-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b83f62002ae8a19102f05868639217fe3dddabf4c099dc0ddf1586901f1501fb"}, + {file = "clickhouse_connect-0.6.9-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:442f9119a223c4f97608d3e4f38debc9c62873e0e9dc948cb1b21691be35af55"}, + {file = "clickhouse_connect-0.6.9-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:cef80d7596887eff39256e29a31c23297a1a65aac735b3e0e323c702dd95d2ee"}, + {file = "clickhouse_connect-0.6.9-cp39-cp39-win32.whl", hash = "sha256:f9cdccf6fa12349e4c25d099bed1d80274104cc4e4a8110f6692e553f4491b99"}, + {file = "clickhouse_connect-0.6.9-cp39-cp39-win_amd64.whl", hash = "sha256:067b5b104e0ac1e16255313766cd97cccd06285ab36f7a2bea7960bd643f5c13"}, + {file = "clickhouse_connect-0.6.9-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:3e08de57aeb1272897208f91873511090d3f904fede4e509f9b2a0ff00db4d49"}, + {file = "clickhouse_connect-0.6.9-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5318b4ac3fbf91ed3ab766bfa55b5ce72ba520181ad6f61fbf37ed63150033f4"}, + {file = "clickhouse_connect-0.6.9-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5df27dfab1565dce2dad8d6ff41a9bc35fb52ed56fba857f26faffac05ffe201"}, + {file = "clickhouse_connect-0.6.9-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:71319fde3214e2382bc7ec402268b9b8c320a2eb86ea764e79a29f7562de06fd"}, + {file = "clickhouse_connect-0.6.9-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:7e0910ac23e7c1ba9af00818f52cdfc812210b4ab10c2be54f1f6456e144e0a7"}, + {file = "clickhouse_connect-0.6.9-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:8566b0b57537b570bbef6736d461108c2354e40bd1b7166f9f51cc2e0d8124cb"}, + {file = "clickhouse_connect-0.6.9-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c7a0f9c9dcb3bb482043a2b0e3ceb371b17d7ad320317529c2834960649fd20"}, + {file = "clickhouse_connect-0.6.9-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70ae9442b369fa6365018ee92cda1fa26eade3b87640c744b8e3d327872cd8ae"}, + {file = "clickhouse_connect-0.6.9-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3c018fcf03428f940dfa52eea7ff443dea9eee20c2e161486d0a6d2509693904"}, + {file = "clickhouse_connect-0.6.9-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:adb7d4a449af756ad9c5b2074ce7844ef34981827cce7510151a8a01493e68f3"}, + {file = "clickhouse_connect-0.6.9-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:66a1d90bcd837734efbe3060f17b98a071f773cac50183efc9a6d2dc40bdbce6"}, + {file = "clickhouse_connect-0.6.9-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41fbc4a75f7098d38246528af34a17b9b7411fb63914787141c82d178bc189be"}, + {file = "clickhouse_connect-0.6.9-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:39b6da9732b26cd98b8ed672bc7684ccf7a589f8d7f56faa7439f8d78b5f4c32"}, + {file = "clickhouse_connect-0.6.9-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2c1954ba9735bf4af6737adc9da68179b6c49b698e288e839705c5c0a260ce85"}, + {file = "clickhouse_connect-0.6.9-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:fa6b01af8c82b860fb4799651dc10a79645b88c8ee103bb14c6e8cdd8b00d8bd"}, ] [package.dependencies] certifi = "*" -importlib-metadata = "*" lz4 = "*" pytz = "*" urllib3 = ">=1.26" @@ -739,13 +738,13 @@ sqlalchemy = ["sqlalchemy (>1.3.21,<2.0)"] [[package]] name = "cohere" -version = "4.20.2" +version = "4.21" description = "" optional = false python-versions = ">=3.7,<4.0" files = [ - {file = "cohere-4.20.2-py3-none-any.whl", hash = "sha256:8572ac0da5dbc1ab5d64558ffe59c8735e34b0d46e1a821a9a4a4a12ef18c89e"}, - {file = "cohere-4.20.2.tar.gz", hash = "sha256:ad4e3f7b8752c3eeddca0dc926bf0f55e843560ef9d9ae0f2d0ca077d9faa803"}, + {file = "cohere-4.21-py3-none-any.whl", hash = "sha256:5eb81db62e78b3156e734421cc3e657054f9d9f1d68b9f38cf48fe3a8ae40dbc"}, + {file = "cohere-4.21.tar.gz", hash = "sha256:f611438f409dfc5d5a0a153a585349f5a80b169c7102b5994d9999ecf8440866"}, ] [package.dependencies] @@ -917,13 +916,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "ctransformers" -version = "0.2.22" +version = "0.2.23" description = "Python bindings for the Transformer models implemented in C/C++ using GGML library." optional = true python-versions = "*" files = [ - {file = "ctransformers-0.2.22-py3-none-any.whl", hash = "sha256:cce72b4ffff3f29d49ea6488110686453b3354c285e96b9c7dd16f273c4b4fc4"}, - {file = "ctransformers-0.2.22.tar.gz", hash = "sha256:ffd15dfe8a6ad45568ac0423bbbb13d7d71b680a7d0b59871a193df8a4b8fdca"}, + {file = "ctransformers-0.2.23-py3-none-any.whl", hash = "sha256:ebbba968c81a71919f9c3975b20d9b6c85e6fd5f640d1f7b86cb8d5d56c3d347"}, + {file = "ctransformers-0.2.23.tar.gz", hash = "sha256:de665dfbd529cf369059e52b277dcbdd6761a0547c8931b3cfbf89ea1eeb3d3c"}, ] [package.dependencies] @@ -1636,13 +1635,13 @@ six = "*" [[package]] name = "google-cloud-aiplatform" -version = "1.30.1" +version = "1.31.0" description = "Vertex AI API client library" optional = false python-versions = ">=3.7" files = [ - {file = "google-cloud-aiplatform-1.30.1.tar.gz", hash = "sha256:7552a6b2e66d7a9ff3c4b2bb95b0e9c182e7475dfb35d6347e9299f78779135a"}, - {file = "google_cloud_aiplatform-1.30.1-py2.py3-none-any.whl", hash = "sha256:ab1bbd4cf83cf583b7dea7e53421ad076f18b63e93cb22fb53c03176d5aa9258"}, + {file = "google-cloud-aiplatform-1.31.0.tar.gz", hash = "sha256:a5de8f5cb9bcd66db08a404cf74e7ed252d5d4038649a58f37588ccb4e2785f0"}, + {file = "google_cloud_aiplatform-1.31.0-py2.py3-none-any.whl", hash = "sha256:19429dfb6098414f758810fde1690d8e8170aff7add4281681dc61de79b4112b"}, ] [package.dependencies] @@ -1658,17 +1657,17 @@ shapely = "<2.0.0" [package.extras] autologging = ["mlflow (>=1.27.0,<=2.1.1)"] cloud-profiler = ["tensorboard-plugin-profile (>=2.4.0,<3.0.0dev)", "tensorflow (>=2.4.0,<3.0.0dev)", "werkzeug (>=2.0.0,<2.1.0dev)"] -datasets = ["pyarrow (>=3.0.0,<8.0dev)"] +datasets = ["pyarrow (>=10.0.1)", "pyarrow (>=3.0.0,<8.0dev)"] endpoint = ["requests (>=2.28.1)"] -full = ["docker (>=5.0.3)", "explainable-ai-sdk (>=1.0.0)", "fastapi (>=0.71.0,<0.76.0)", "google-cloud-bigquery-storage", "google-vizier (==0.0.4)", "lit-nlp (==0.4.0)", "mlflow (>=1.27.0,<=2.1.1)", "numpy (>=1.15.0)", "pandas (>=1.0.0)", "pyarrow (>=3.0.0,<8.0dev)", "pyarrow (>=6.0.1)", "pyyaml (>=5.3,<7)", "requests (>=2.28.1)", "starlette (>=0.17.1)", "tensorflow (>=2.3.0,<3.0.0dev)", "urllib3 (>=1.21.1,<1.27)", "uvicorn[standard] (>=0.16.0)"] +full = ["docker (>=5.0.3)", "explainable-ai-sdk (>=1.0.0)", "fastapi (>=0.71.0,<0.76.0)", "google-cloud-bigquery-storage", "google-vizier (==0.0.4)", "google-vizier (>=0.1.6)", "lit-nlp (==0.4.0)", "mlflow (>=1.27.0,<=2.1.1)", "numpy (>=1.15.0)", "pandas (>=1.0.0)", "pyarrow (>=10.0.1)", "pyarrow (>=3.0.0,<8.0dev)", "pyarrow (>=6.0.1)", "pyyaml (==5.3.1)", "requests (>=2.28.1)", "starlette (>=0.17.1)", "tensorflow (>=2.3.0,<3.0.0dev)", "urllib3 (>=1.21.1,<1.27)", "uvicorn[standard] (>=0.16.0)"] lit = ["explainable-ai-sdk (>=1.0.0)", "lit-nlp (==0.4.0)", "pandas (>=1.0.0)", "tensorflow (>=2.3.0,<3.0.0dev)"] metadata = ["numpy (>=1.15.0)", "pandas (>=1.0.0)"] -pipelines = ["pyyaml (>=5.3,<7)"] +pipelines = ["pyyaml (==5.3.1)"] prediction = ["docker (>=5.0.3)", "fastapi (>=0.71.0,<0.76.0)", "starlette (>=0.17.1)", "uvicorn[standard] (>=0.16.0)"] private-endpoints = ["requests (>=2.28.1)", "urllib3 (>=1.21.1,<1.27)"] tensorboard = ["tensorflow (>=2.3.0,<3.0.0dev)"] -testing = ["docker (>=5.0.3)", "explainable-ai-sdk (>=1.0.0)", "fastapi (>=0.71.0,<0.76.0)", "google-cloud-bigquery-storage", "google-vizier (==0.0.4)", "grpcio-testing", "ipython", "kfp", "lit-nlp (==0.4.0)", "mlflow (>=1.27.0,<=2.1.1)", "numpy (>=1.15.0)", "pandas (>=1.0.0)", "pyarrow (>=3.0.0,<8.0dev)", "pyarrow (>=6.0.1)", "pytest-asyncio", "pytest-xdist", "pyyaml (>=5.3,<7)", "requests (>=2.28.1)", "scikit-learn", "starlette (>=0.17.1)", "tensorboard-plugin-profile (>=2.4.0,<3.0.0dev)", "tensorflow (>=2.3.0,<3.0.0dev)", "tensorflow (>=2.4.0,<3.0.0dev)", "urllib3 (>=1.21.1,<1.27)", "uvicorn[standard] (>=0.16.0)", "werkzeug (>=2.0.0,<2.1.0dev)", "xgboost"] -vizier = ["google-vizier (==0.0.4)"] +testing = ["docker (>=5.0.3)", "explainable-ai-sdk (>=1.0.0)", "fastapi (>=0.71.0,<0.76.0)", "google-cloud-bigquery-storage", "google-vizier (==0.0.4)", "google-vizier (>=0.1.6)", "grpcio-testing", "ipython", "kfp", "lit-nlp (==0.4.0)", "mlflow (>=1.27.0,<=2.1.1)", "numpy (>=1.15.0)", "pandas (>=1.0.0)", "pyarrow (>=10.0.1)", "pyarrow (>=3.0.0,<8.0dev)", "pyarrow (>=6.0.1)", "pytest-asyncio", "pytest-xdist", "pyyaml (==5.3.1)", "requests (>=2.28.1)", "scikit-learn", "starlette (>=0.17.1)", "tensorboard-plugin-profile (>=2.4.0,<3.0.0dev)", "tensorflow (>=2.3.0,<3.0.0dev)", "tensorflow (>=2.4.0,<3.0.0dev)", "urllib3 (>=1.21.1,<1.27)", "uvicorn[standard] (>=0.16.0)", "werkzeug (>=2.0.0,<2.1.0dev)", "xgboost"] +vizier = ["google-vizier (==0.0.4)", "google-vizier (>=0.1.6)"] xai = ["tensorflow (>=2.3.0,<3.0.0dev)"] [[package]] @@ -2901,12 +2900,12 @@ langchain = ">=0.0.239" [[package]] name = "langchain-serve" -version = "0.0.60" +version = "0.0.61" description = "Langchain Serve - serve your langchain apps on Jina AI Cloud." optional = true python-versions = "*" files = [ - {file = "langchain-serve-0.0.60.tar.gz", hash = "sha256:bfcc2e7c2a3cd3b4cde5ff45043cc9c8d437704941b02d166185d8334a120561"}, + {file = "langchain-serve-0.0.61.tar.gz", hash = "sha256:f13d8b84f46b3789e7813deba798c04fa1d0a155bf5e1bf8b9addb7d6c01614c"}, ] [package.dependencies] @@ -2926,13 +2925,13 @@ test = ["psutil", "pytest", "pytest-asyncio"] [[package]] name = "langsmith" -version = "0.0.24" +version = "0.0.26" description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform." optional = false python-versions = ">=3.8.1,<4.0" files = [ - {file = "langsmith-0.0.24-py3-none-any.whl", hash = "sha256:f9f951d070aa1919123d700642aca9c781edfc8797a65ab1161aa12f89bed707"}, - {file = "langsmith-0.0.24.tar.gz", hash = "sha256:9c066dd915752324490a735692997b0db0958f5dfc1e0a0dfbf752c6e62c7529"}, + {file = "langsmith-0.0.26-py3-none-any.whl", hash = "sha256:61c1d4582104d96edde04e1eea1dae347645b691c44489a5871341a2a1a2a1eb"}, + {file = "langsmith-0.0.26.tar.gz", hash = "sha256:80a4ef1b663a24a460d25b9986ab2010c5d06b6061c65be473abafc0647d191a"}, ] [package.dependencies] @@ -2961,21 +2960,21 @@ test = ["coverage", "pytest", "pytest-cov"] [[package]] name = "llama-cpp-python" -version = "0.1.77" +version = "0.1.78" description = "A Python wrapper for llama.cpp" optional = true python-versions = ">=3.7" files = [ - {file = "llama_cpp_python-0.1.77.tar.gz", hash = "sha256:76c7fae8f5386edecf38cb149bf119127e1208883f0456c6998465648d6c242e"}, + {file = "llama_cpp_python-0.1.78.tar.gz", hash = "sha256:cffdcbc4b5fca2bceb1f6bf3590460ebc898c69295a02439dfc6327566e10367"}, ] [package.dependencies] -diskcache = ">=5.6.1" -numpy = ">=1.20.0" -typing-extensions = ">=4.5.0" +diskcache = ">=5.6.1,<6.0.0" +numpy = ">=1.24.4,<2.0.0" +typing-extensions = ">=4.7.1,<5.0.0" [package.extras] -server = ["fastapi (>=0.100.0)", "pydantic-settings (>=2.0.1)", "sse-starlette (>=1.6.1)", "uvicorn (>=0.22.0)"] +server = ["fastapi (>=0.100.0)", "pydantic-settings (>=2.0.1)", "sse-starlette (>=1.6.1)", "uvicorn (>=0.23.2,<0.24.0)"] [[package]] name = "loguru" @@ -3309,13 +3308,13 @@ files = [ [[package]] name = "metaphor-python" -version = "0.1.14" +version = "0.1.15" description = "A Python package for the Metaphor API." optional = false python-versions = "*" files = [ - {file = "metaphor-python-0.1.14.tar.gz", hash = "sha256:9c9be35d1270e1e2984637711c15b614ad852fbd2b51d428b4cc478e95018fab"}, - {file = "metaphor_python-0.1.14-py3-none-any.whl", hash = "sha256:9435fb702d62032e4affbf7825fe4b1f0c6099d33b4867f4238c07f4515eb9a2"}, + {file = "metaphor-python-0.1.15.tar.gz", hash = "sha256:66e324377af7df4799b845fe8de4f81393db48baa76db59308f7eebec2ba9421"}, + {file = "metaphor_python-0.1.15-py3-none-any.whl", hash = "sha256:e9efe6ccd175d67b08331955c0290ff1fe83bb4c43e80a88a154e254bf47aaf4"}, ] [package.dependencies] @@ -3728,13 +3727,13 @@ sympy = "*" [[package]] name = "openai" -version = "0.27.8" +version = "0.27.9" description = "Python client library for the OpenAI API" optional = false python-versions = ">=3.7.1" files = [ - {file = "openai-0.27.8-py3-none-any.whl", hash = "sha256:e0a7c2f7da26bdbe5354b03c6d4b82a2f34bd4458c7a17ae1a7092c3e397e03c"}, - {file = "openai-0.27.8.tar.gz", hash = "sha256:2483095c7db1eee274cebac79e315a986c4e55207bb4fa7b82d185b3a2ed9536"}, + {file = "openai-0.27.9-py3-none-any.whl", hash = "sha256:6a3cf8e276d1a6262b50562fbc0cba7967cfebb78ed827d375986b48fdad6475"}, + {file = "openai-0.27.9.tar.gz", hash = "sha256:b687761c82f5ebb6f61efc791b2083d2d068277b94802d4d1369efe39851813d"}, ] [package.dependencies] @@ -4969,85 +4968,92 @@ plugins = ["importlib-metadata"] [[package]] name = "pymongo" -version = "4.4.1" +version = "4.5.0" description = "Python driver for MongoDB " optional = false python-versions = ">=3.7" files = [ - {file = "pymongo-4.4.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:bbdd6c719cc2ea440d7245ba71ecdda507275071753c6ffe9c8232647246f575"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux1_i686.whl", hash = "sha256:a438508dd8007a4a724601c3790db46fe0edc3d7d172acafc5f148ceb4a07815"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:3a350d03959f9d5b7f2ea0621f5bb2eb3927b8fc1c4031d12cfd3949839d4f66"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux2014_i686.whl", hash = "sha256:e6d5d2c97c35f83dc65ccd5d64c7ed16eba6d9403e3744e847aee648c432f0bb"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux2014_ppc64le.whl", hash = "sha256:1944b16ffef3573ae064196460de43eb1c865a64fed23551b5eac1951d80acca"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux2014_s390x.whl", hash = "sha256:912b0fdc16500125dc1837be8b13c99d6782d93d6cd099d0e090e2aca0b6d100"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux2014_x86_64.whl", hash = "sha256:d1b1c8eb21de4cb5e296614e8b775d5ecf9c56b7d3c6000f4bfdb17f9e244e72"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e3b508e0de613b906267f2c484cb5e9afd3a64680e1af23386ca8f99a29c6145"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f41feb8cf429799ac43ed34504839954aa7d907f8bd9ecb52ed5ff0d2ea84245"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1897123c4bede1af0c264a3bc389a2505bae50d85e4f211288d352928c02d017"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b4c4bcd285bf0f5272d50628e4ea3989738e3af1251b2dd7bf50da2d593f3a56"}, - {file = "pymongo-4.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:995b868ccc9df8d36cb28142363e3911846fe9f43348d942951f60cdd7f62224"}, - {file = "pymongo-4.4.1-cp310-cp310-win32.whl", hash = "sha256:a5198beca36778f19a98b56f541a0529502046bc867b352dda5b6322e1ddc4fd"}, - {file = "pymongo-4.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:a86d20210c9805a032cda14225087ec483613aff0955327c7871a3c980562c5b"}, - {file = "pymongo-4.4.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:5a2a1da505ea78787b0382c92dc21a45d19918014394b220c4734857e9c73694"}, - {file = "pymongo-4.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:35545583396684ea70a0b005034a469bf3f447732396e5b3d50bec94890b8d5c"}, - {file = "pymongo-4.4.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5248fdf7244a5e976279fe154d116c73f6206e0be71074ea9d9b1e73b5893dd5"}, - {file = "pymongo-4.4.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:44381b817eeb47a41bbfbd279594a7fb21017e0e3e15550eb0fd3758333097f3"}, - {file = "pymongo-4.4.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f0bd25de90b804cc95e548f55f430df2b47f242a4d7bbce486db62f3b3c981f"}, - {file = "pymongo-4.4.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d67f4029c57b36a0278aeae044ce382752c078c7625cef71b5e2cf3e576961f9"}, - {file = "pymongo-4.4.1-cp311-cp311-win32.whl", hash = "sha256:8082eef0d8c711c9c272906fa469965e52b44dbdb8a589b54857b1351dc2e511"}, - {file = "pymongo-4.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:980da627edc1275896d7d4670596433ec66e1f452ec244e07bbb2f91c955b581"}, - {file = "pymongo-4.4.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:6cf08997d3ecf9a1eabe12c35aa82a5c588f53fac054ed46fe5c16a0a20ea43d"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:a6750449759f0a83adc9df3a469483a8c3eef077490b76f30c03dc8f7a4b1d66"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:efa67f46c1678df541e8f41247d22430905f80a3296d9c914aaa793f2c9fa1db"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:d9a5e16a32fb1000c72a8734ddd8ae291974deb5d38d40d1bdd01dbe4024eeb0"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:36b0b06c6e830d190215fced82872e5fd8239771063afa206f9adc09574018a3"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux2014_ppc64le.whl", hash = "sha256:4ec9c6d4547c93cf39787c249969f7348ef6c4d36439af10d57b5ee65f3dfbf9"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:5368801ca6b66aacc5cc013258f11899cd6a4c3bb28cec435dd67f835905e9d2"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:91848d555155ad4594de5e575b6452adc471bc7bc4b4d2b1f4f15a78a8af7843"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e0f08a2dba1469252462c414b66cb416c7f7295f2c85e50f735122a251fcb131"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2fe4bbf2b2c91e4690b5658b0fbb98ca6e0a8fba9ececd65b4e7d2d1df3e9b01"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7e307d67641d0e2f7e7d6ee3dad880d090dace96cc1d95c99d15bd9f545a1168"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d43634594f2486cc9bb604a1dc0914234878c4faf6604574a25260cb2faaa06"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef0e3279e72cccc3dc7be75b12b1e54cc938d7ce13f5f22bea844b9d9d5fecd4"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:05935f5a4bbae0a99482147588351b7b17999f4a4e6e55abfb74367ac58c0634"}, - {file = "pymongo-4.4.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:854d92d2437e3496742e17342496e1f3d9efb22455501fd6010aa3658138e457"}, - {file = "pymongo-4.4.1-cp37-cp37m-win32.whl", hash = "sha256:ddffc0c6d0e92cf43dc6c47639d1ef9ab3c280db2998a33dbb9953bd864841e1"}, - {file = "pymongo-4.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:2259302d8ab51cd56c3d9d5cca325977e35a0bb3a15a297ec124d2da56c214f7"}, - {file = "pymongo-4.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:262a4073d2ee0654f0314ef4d9aab1d8c13dc8dae5c102312e152c02bfa7bdb7"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:022c91e2a41eefbcddc844c534520a13c6f613666c37b9fb9ed039eff47bd2e4"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:a0d326c3ba989091026fbc4827638dc169abdbb0c0bbe593716921543f530af6"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:5a1e5b931bf729b2eacd720a0e40201c2d5ed0e2bada60863f19b069bb5016c4"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:54d0b8b6f2548e15b09232827d9ba8e03a599c9a30534f7f2c7bae79df2d1f91"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux2014_ppc64le.whl", hash = "sha256:e426e213ab07a73f8759ab8d69e87d05d7a60b3ecbf7673965948dcf8ebc1c9f"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:53831effe4dc0243231a944dfbd87896e42b1cf081776930de5cc74371405e3b"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:977c34b5b0b50bd169fbca1a4dd06fbfdfd8ac47734fdc3473532c10098e16ce"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fab52db4d3aa3b73bcf920fb375dbea63bf0df0cb4bdb38c5a0a69e16568cc21"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bb935789276422d8875f051837356edfccdb886e673444d91e4941a8142bd48"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9d45243ff4800320c842c45e01c91037e281840e8c6ed2949ed82a70f55c0e6a"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:32d6d2b7e14bb6bc052f6cba0c1cf4d47a2b49c56ea1ed0f960a02bc9afaefb2"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:85b92b3828b2c923ed448f820c147ee51fa4566e35c9bf88415586eb0192ced2"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3f345380f6d6d6d1dc6db9fa5c8480c439ea79553b71a2cbe3030a1f20676595"}, - {file = "pymongo-4.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:0dcc64747b628a96bcfc6405c42acae3762c85d8ae8c1ce18834b8151cad7486"}, - {file = "pymongo-4.4.1-cp38-cp38-win32.whl", hash = "sha256:ebe1683ec85d8bca389183d01ecf4640c797d6f22e6dac3453a6c492920d5ec3"}, - {file = "pymongo-4.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:58c492e28057838792bed67875f982ffbd3c9ceb67341cc03811859fddb8efbf"}, - {file = "pymongo-4.4.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:aed21b3142311ad139629c4e101b54f25447ec40d6f42c72ad5c1a6f4f851f3a"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:98764ae13de0ab80ba824ca0b84177006dec51f48dfb7c944d8fa78ab645c67f"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7b7127bb35f10d974ec1bd5573389e99054c558b821c9f23bb8ff94e7ae6e612"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:48409bac0f6a62825c306c9a124698df920afdc396132908a8e88b466925a248"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:55b6ebeeabe32a9d2e38eeb90f07c020cb91098b34b5fca42ff3991cb6e6e621"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux2014_ppc64le.whl", hash = "sha256:4e6a70c9d437b043fb07eef1796060f476359e5b7d8e23baa49f1a70379d6543"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:0bdbbcc1ef3a56347630c57eda5cd9536bdbdb82754b3108c66cbc51b5233dfb"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:04ec1c5451ad358fdbff28ddc6e8a3d1b5f62178d38cd08007a251bc3f59445a"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0a7739bcebdbeb5648edb15af00fd38f2ab5de20851a1341d229494a638284cc"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:02dba4ea2a6f22de4b50864d3957a0110b75d3eeb40aeab0b0ff64bcb5a063e6"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:884a35c0740744a48f67210692841581ab83a4608d3a031e7125022989ef65f8"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2aab6d1cff00d68212eca75d2260980202b14038d9298fed7d5c455fe3285c7c"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ae1f85223193f249320f695eec4242cdcc311357f5f5064c2e72cfd18017e8ee"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b25d2ccdb2901655cc56c0fc978c5ddb35029c46bfd30d182d0e23fffd55b14b"}, - {file = "pymongo-4.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:334d41649f157c56a47fb289bae3b647a867c1a74f5f3a8a371fb361580bd9d3"}, - {file = "pymongo-4.4.1-cp39-cp39-win32.whl", hash = "sha256:c409e5888a94a3ff99783fffd9477128ffab8416e3f8b2c633993eecdcd5c267"}, - {file = "pymongo-4.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:3681caf37edbe05f72f0d351e4a6cb5874ec7ab5eeb99df3a277dbf110093739"}, - {file = "pymongo-4.4.1.tar.gz", hash = "sha256:a4df87dbbd03ac6372d24f2a8054b4dc33de497d5227b50ec649f436ad574284"}, + {file = "pymongo-4.5.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2d4fa1b01fa7e5b7bb8d312e3542e211b320eb7a4e3d8dc884327039d93cb9e0"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux1_i686.whl", hash = "sha256:dfcd2b9f510411de615ccedd47462dae80e82fdc09fe9ab0f0f32f11cf57eeb5"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:3e33064f1984db412b34d51496f4ea785a9cff621c67de58e09fb28da6468a52"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux2014_i686.whl", hash = "sha256:33faa786cc907de63f745f587e9879429b46033d7d97a7b84b37f4f8f47b9b32"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux2014_ppc64le.whl", hash = "sha256:76a262c41c1a7cbb84a3b11976578a7eb8e788c4b7bfbd15c005fb6ca88e6e50"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux2014_s390x.whl", hash = "sha256:0f4b125b46fe377984fbaecf2af40ed48b05a4b7676a2ff98999f2016d66b3ec"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux2014_x86_64.whl", hash = "sha256:40d5f6e853ece9bfc01e9129b228df446f49316a4252bb1fbfae5c3c9dedebad"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:152259f0f1a60f560323aacf463a3642a65a25557683f49cfa08c8f1ecb2395a"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6d64878d1659d2a5bdfd0f0a4d79bafe68653c573681495e424ab40d7b6d6d41"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f1bb3a62395ffe835dbef3a1cbff48fbcce709c78bd1f52e896aee990928432b"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fe48f50fb6348511a3268a893bfd4ab5f263f5ac220782449d03cd05964d1ae7"}, + {file = "pymongo-4.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7591a3beea6a9a4fa3080d27d193b41f631130e3ffa76b88c9ccea123f26dc59"}, + {file = "pymongo-4.5.0-cp310-cp310-win32.whl", hash = "sha256:3a7166d57dc74d679caa7743b8ecf7dc3a1235a9fd178654dddb2b2a627ae229"}, + {file = "pymongo-4.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:21b953da14549ff62ea4ae20889c71564328958cbdf880c64a92a48dda4c9c53"}, + {file = "pymongo-4.5.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ead4f19d0257a756b21ac2e0e85a37a7245ddec36d3b6008d5bfe416525967dc"}, + {file = "pymongo-4.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9aff6279e405dc953eeb540ab061e72c03cf38119613fce183a8e94f31be608f"}, + {file = "pymongo-4.5.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cd4c8d6aa91d3e35016847cbe8d73106e3d1c9a4e6578d38e2c346bfe8edb3ca"}, + {file = "pymongo-4.5.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:08819da7864f9b8d4a95729b2bea5fffed08b63d3b9c15b4fea47de655766cf5"}, + {file = "pymongo-4.5.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a253b765b7cbc4209f1d8ee16c7287c4268d3243070bf72d7eec5aa9dfe2a2c2"}, + {file = "pymongo-4.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8027c9063579083746147cf401a7072a9fb6829678076cd3deff28bb0e0f50c8"}, + {file = "pymongo-4.5.0-cp311-cp311-win32.whl", hash = "sha256:9d2346b00af524757576cc2406414562cced1d4349c92166a0ee377a2a483a80"}, + {file = "pymongo-4.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:c3c3525ea8658ee1192cdddf5faf99b07ebe1eeaa61bf32821126df6d1b8072b"}, + {file = "pymongo-4.5.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:e5a27f348909235a106a3903fc8e70f573d89b41d723a500869c6569a391cff7"}, + {file = "pymongo-4.5.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9a9a39b7cac81dca79fca8c2a6479ef4c7b1aab95fad7544cc0e8fd943595a2"}, + {file = "pymongo-4.5.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:496c9cbcb4951183d4503a9d7d2c1e3694aab1304262f831d5e1917e60386036"}, + {file = "pymongo-4.5.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:23cc6d7eb009c688d70da186b8f362d61d5dd1a2c14a45b890bd1e91e9c451f2"}, + {file = "pymongo-4.5.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fff7d17d30b2cd45afd654b3fc117755c5d84506ed25fda386494e4e0a3416e1"}, + {file = "pymongo-4.5.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6422b6763b016f2ef2beedded0e546d6aa6ba87910f9244d86e0ac7690f75c96"}, + {file = "pymongo-4.5.0-cp312-cp312-win32.whl", hash = "sha256:77cfff95c1fafd09e940b3fdcb7b65f11442662fad611d0e69b4dd5d17a81c60"}, + {file = "pymongo-4.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:e57d859b972c75ee44ea2ef4758f12821243e99de814030f69a3decb2aa86807"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2b0176f9233a5927084c79ff80b51bd70bfd57e4f3d564f50f80238e797f0c8a"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:89b3f2da57a27913d15d2a07d58482f33d0a5b28abd20b8e643ab4d625e36257"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:5caee7bd08c3d36ec54617832b44985bd70c4cbd77c5b313de6f7fce0bb34f93"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:1d40ad09d9f5e719bc6f729cc6b17f31c0b055029719406bd31dde2f72fca7e7"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux2014_ppc64le.whl", hash = "sha256:076afa0a4a96ca9f77fec0e4a0d241200b3b3a1766f8d7be9a905ecf59a7416b"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:3fa3648e4f1e63ddfe53563ee111079ea3ab35c3b09cd25bc22dadc8269a495f"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:44ee985194c426ddf781fa784f31ffa29cb59657b2dba09250a4245431847d73"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b33c17d9e694b66d7e96977e9e56df19d662031483efe121a24772a44ccbbc7e"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3d79ae3bb1ff041c0db56f138c88ce1dfb0209f3546d8d6e7c3f74944ecd2439"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d67225f05f6ea27c8dc57f3fa6397c96d09c42af69d46629f71e82e66d33fa4f"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41771b22dd2822540f79a877c391283d4e6368125999a5ec8beee1ce566f3f82"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a1f26bc1f5ce774d99725773901820dfdfd24e875028da4a0252a5b48dcab5c"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3236cf89d69679eaeb9119c840f5c7eb388a2110b57af6bb6baf01a1da387c18"}, + {file = "pymongo-4.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e1f61355c821e870fb4c17cdb318669cfbcf245a291ce5053b41140870c3e5cc"}, + {file = "pymongo-4.5.0-cp37-cp37m-win32.whl", hash = "sha256:49dce6957598975d8b8d506329d2a3a6c4aee911fa4bbcf5e52ffc6897122950"}, + {file = "pymongo-4.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:f2227a08b091bd41df5aadee0a5037673f691e2aa000e1968b1ea2342afc6880"}, + {file = "pymongo-4.5.0-cp38-cp38-macosx_11_0_universal2.whl", hash = "sha256:435228d3c16a375274ac8ab9c4f9aef40c5e57ddb8296e20ecec9e2461da1017"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:8e559116e4128630ad3b7e788e2e5da81cbc2344dee246af44471fa650486a70"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:840eaf30ccac122df260b6005f9dfae4ac287c498ee91e3e90c56781614ca238"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:b4fe46b58010115514b842c669a0ed9b6a342017b15905653a5b1724ab80917f"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:a8127437ebc196a6f5e8fddd746bd0903a400dc6b5ae35df672dd1ccc7170a2a"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux2014_ppc64le.whl", hash = "sha256:2988ef5e6b360b3ff1c6d55c53515499de5f48df31afd9f785d788cdacfbe2d3"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:e249190b018d63c901678053b4a43e797ca78b93fb6d17633e3567d4b3ec6107"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:1240edc1a448d4ada4bf1a0e55550b6292420915292408e59159fd8bbdaf8f63"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b6d2a56fc2354bb6378f3634402eec788a8f3facf0b3e7d468db5f2b5a78d763"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2a0aade2b11dc0c326ccd429ee4134d2d47459ff68d449c6d7e01e74651bd255"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:74c0da07c04d0781490b2915e7514b1adb265ef22af039a947988c331ee7455b"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3754acbd7efc7f1b529039fcffc092a15e1cf045e31f22f6c9c5950c613ec4d"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:631492573a1bef2f74f9ac0f9d84e0ce422c251644cd81207530af4aa2ee1980"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e2654d1278384cff75952682d17c718ecc1ad1d6227bb0068fd826ba47d426a5"}, + {file = "pymongo-4.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:168172ef7856e20ec024fe2a746bfa895c88b32720138e6438fd765ebd2b62dd"}, + {file = "pymongo-4.5.0-cp38-cp38-win32.whl", hash = "sha256:b25f7bea162b3dbec6d33c522097ef81df7c19a9300722fa6853f5b495aecb77"}, + {file = "pymongo-4.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:b520aafc6cb148bac09ccf532f52cbd31d83acf4d3e5070d84efe3c019a1adbf"}, + {file = "pymongo-4.5.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8543253adfaa0b802bfa88386db1009c6ebb7d5684d093ee4edc725007553d21"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:bc5d8c3647b8ae28e4312f1492b8f29deebd31479cd3abaa989090fb1d66db83"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:505f8519c4c782a61d94a17b0da50be639ec462128fbd10ab0a34889218fdee3"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:53f2dda54d76a98b43a410498bd12f6034b2a14b6844ca08513733b2b20b7ad8"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:9c04b9560872fa9a91251030c488e0a73bce9321a70f991f830c72b3f8115d0d"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux2014_ppc64le.whl", hash = "sha256:58a63a26a1e3dc481dd3a18d6d9f8bd1d576cd1ffe0d479ba7dd38b0aeb20066"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:f076b779aa3dc179aa3ed861be063a313ed4e48ae9f6a8370a9b1295d4502111"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:1b1d7d9aabd8629a31d63cd106d56cca0e6420f38e50563278b520f385c0d86e"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37df8f6006286a5896d1cbc3efb8471ced42e3568d38e6cb00857277047b0d63"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:56320c401f544d762fc35766936178fbceb1d9261cd7b24fbfbc8fb6f67aa8a5"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bbd705d5f3c3d1ff2d169e418bb789ff07ab3c70d567cc6ba6b72b04b9143481"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80a167081c75cf66b32f30e2f1eaee9365af935a86dbd76788169911bed9b5d5"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4c42748ccc451dfcd9cef6c5447a7ab727351fd9747ad431db5ebb18a9b78a4d"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:cf62da7a4cdec9a4b2981fcbd5e08053edffccf20e845c0b6ec1e77eb7fab61d"}, + {file = "pymongo-4.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b5bbb87fa0511bd313d9a2c90294c88db837667c2bda2ea3fa7a35b59fd93b1f"}, + {file = "pymongo-4.5.0-cp39-cp39-win32.whl", hash = "sha256:465fd5b040206f8bce7016b01d7e7f79d2fcd7c2b8e41791be9632a9df1b4999"}, + {file = "pymongo-4.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:63d8019eee119df308a075b8a7bdb06d4720bf791e2b73d5ab0e7473c115d79c"}, + {file = "pymongo-4.5.0.tar.gz", hash = "sha256:681f252e43b3ef054ca9161635f81b730f4d8cadd28b3f2b2004f5a72f853982"}, ] [package.dependencies] @@ -5055,9 +5061,9 @@ dnspython = ">=1.16.0,<3.0.0" [package.extras] aws = ["pymongo-auth-aws (<2.0.0)"] -encryption = ["pymongo-auth-aws (<2.0.0)", "pymongocrypt (>=1.6.0,<2.0.0)"] -gssapi = ["pykerberos"] -ocsp = ["certifi", "pyopenssl (>=17.2.0)", "requests (<3.0.0)", "service-identity (>=18.1.0)"] +encryption = ["certifi", "pymongo[aws]", "pymongocrypt (>=1.6.0,<2.0.0)"] +gssapi = ["pykerberos", "winkerberos (>=0.5.0)"] +ocsp = ["certifi", "cryptography (>=2.5)", "pyopenssl (>=17.2.0)", "requests (<3.0.0)", "service-identity (>=18.1.0)"] snappy = ["python-snappy"] zstd = ["zstandard"] @@ -5088,13 +5094,13 @@ diagrams = ["jinja2", "railroad-diagrams"] [[package]] name = "pypdf" -version = "3.15.1" +version = "3.15.2" description = "A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files" optional = false python-versions = ">=3.6" files = [ - {file = "pypdf-3.15.1-py3-none-any.whl", hash = "sha256:99b337af7da8046d1e2e94354846e8c56753e1cdc817ac0fbe770c1e2281902b"}, - {file = "pypdf-3.15.1.tar.gz", hash = "sha256:d0dfaf4f10dfb06ac39e1d6a9cbffd63e77621d1e89c0ef08f346fd902df7b4b"}, + {file = "pypdf-3.15.2-py3-none-any.whl", hash = "sha256:f6e598292be34187287a609c72815c1502b3dc2c997b374ba0870ce79d2e975a"}, + {file = "pypdf-3.15.2.tar.gz", hash = "sha256:cdf7d75ebb8901f3352cf9488c5f662c6de9c52e432c429d15cada67ba372fce"}, ] [package.dependencies] @@ -5102,7 +5108,7 @@ typing_extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\ [package.extras] crypto = ["PyCryptodome", "cryptography"] -dev = ["black", "flit", "pip-tools", "pre-commit (<2.18.0)", "pytest-cov", "pytest-socket", "wheel"] +dev = ["black", "flit", "pip-tools", "pre-commit (<2.18.0)", "pytest-cov", "pytest-socket", "pytest-timeout", "wheel"] docs = ["myst_parser", "sphinx", "sphinx_rtd_theme"] full = ["Pillow (>=8.0.0)", "PyCryptodome", "cryptography"] image = ["Pillow (>=8.0.0)"] @@ -5544,13 +5550,13 @@ urllib3 = ">=1.26.14,<2.0.0" [[package]] name = "readme-renderer" -version = "40.0" +version = "41.0" description = "readme_renderer is a library for rendering \"readme\" descriptions for Warehouse" optional = false python-versions = ">=3.8" files = [ - {file = "readme_renderer-40.0-py3-none-any.whl", hash = "sha256:e18feb2a1e7706f2865b81ebb460056d93fb29d69daa10b223c00faa7bd9a00a"}, - {file = "readme_renderer-40.0.tar.gz", hash = "sha256:9f77b519d96d03d7d7dce44977ba543090a14397c4f60de5b6eb5b8048110aa4"}, + {file = "readme_renderer-41.0-py3-none-any.whl", hash = "sha256:a38243d5b6741b700a850026e62da4bd739edc7422071e95fd5c4bb60171df86"}, + {file = "readme_renderer-41.0.tar.gz", hash = "sha256:4f4b11e5893f5a5d725f592c5a343e0dc74f5f273cb3dcf8c42d9703a27073f7"}, ] [package.dependencies] @@ -6022,17 +6028,17 @@ files = [ [[package]] name = "setuptools" -version = "68.1.0" +version = "68.1.2" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "setuptools-68.1.0-py3-none-any.whl", hash = "sha256:e13e1b0bc760e9b0127eda042845999b2f913e12437046e663b833aa96d89715"}, - {file = "setuptools-68.1.0.tar.gz", hash = "sha256:d59c97e7b774979a5ccb96388efc9eb65518004537e85d52e81eaee89ab6dd91"}, + {file = "setuptools-68.1.2-py3-none-any.whl", hash = "sha256:3d8083eed2d13afc9426f227b24fd1659489ec107c0e86cec2ffdde5c92e790b"}, + {file = "setuptools-68.1.2.tar.gz", hash = "sha256:3d4dfa6d95f1b101d695a6160a7626e15583af71a5f52176efa5d39a054d475d"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5,<=7.1.2)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] @@ -6423,13 +6429,13 @@ doc = ["reno", "sphinx", "tornado (>=4.5)"] [[package]] name = "textual" -version = "0.33.0" +version = "0.34.0" description = "Modern Text User Interface framework" optional = true python-versions = ">=3.7,<4.0" files = [ - {file = "textual-0.33.0-py3-none-any.whl", hash = "sha256:698a093add0fd21c786232bcacde9ff427a9d5dc9ea5deca93437d9453e4ead1"}, - {file = "textual-0.33.0.tar.gz", hash = "sha256:e0a98b1d9c4458c5bb4269c65d0a7f3e926f197411242d2f8faf80183d47a728"}, + {file = "textual-0.34.0-py3-none-any.whl", hash = "sha256:c695866acd8e85519eb0920cb921999ac5f58891ef7925e8b132e0eebc142e88"}, + {file = "textual-0.34.0.tar.gz", hash = "sha256:b66deee4afa9f6986c1bee973731d7dad2b169872377d238c9aad7141449b443"}, ] [package.dependencies] @@ -6715,18 +6721,18 @@ test = ["argcomplete (>=2.0)", "pre-commit", "pytest", "pytest-mock"] [[package]] name = "transformers" -version = "4.31.0" +version = "4.32.0" description = "State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" optional = true python-versions = ">=3.8.0" files = [ - {file = "transformers-4.31.0-py3-none-any.whl", hash = "sha256:8487aab0195ce1c2a5ae189305118b9720daddbc7b688edb09ccd79e3b149f6b"}, - {file = "transformers-4.31.0.tar.gz", hash = "sha256:4302fba920a1c24d3a429a29efff6a63eac03f3f3cf55b55927fc795d01cb273"}, + {file = "transformers-4.32.0-py3-none-any.whl", hash = "sha256:32d8adf0ed76285508e7fd66657b4448ec1f882599ae6bf6f9c36bd7bf798402"}, + {file = "transformers-4.32.0.tar.gz", hash = "sha256:ca510f9688d2fe7347abbbfbd13f2f6dcd3c8349870c8d0ed98beed5f579b354"}, ] [package.dependencies] filelock = "*" -huggingface-hub = ">=0.14.1,<1.0" +huggingface-hub = ">=0.15.1,<1.0" numpy = ">=1.17" packaging = ">=20.0" pyyaml = ">=5.1" @@ -6739,18 +6745,18 @@ tqdm = ">=4.27" [package.extras] accelerate = ["accelerate (>=0.20.3)"] agents = ["Pillow (<10.0.0)", "accelerate (>=0.20.3)", "datasets (!=2.5.0)", "diffusers", "opencv-python", "sentencepiece (>=0.1.91,!=0.1.92)", "torch (>=1.9,!=1.12.0)"] -all = ["Pillow (<10.0.0)", "accelerate (>=0.20.3)", "av (==9.2.0)", "codecarbon (==1.2.0)", "decord (==0.6.0)", "flax (>=0.4.1,<=0.7.0)", "jax (>=0.2.8,!=0.3.2,<=0.4.13)", "jaxlib (>=0.1.65,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "phonemizer", "protobuf", "pyctcdecode (>=0.4.0)", "ray[tune]", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "tensorflow (>=2.6,<2.14)", "tensorflow-text (<2.14)", "tf2onnx", "timm", "tokenizers (>=0.11.1,!=0.11.3,<0.14)", "torch (>=1.9,!=1.12.0)", "torchaudio", "torchvision"] +all = ["Pillow (<10.0.0)", "accelerate (>=0.20.3)", "av (==9.2.0)", "codecarbon (==1.2.0)", "decord (==0.6.0)", "flax (>=0.4.1,<=0.7.0)", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "phonemizer", "protobuf", "pyctcdecode (>=0.4.0)", "ray[tune]", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "tensorflow (>=2.6,<2.14)", "tensorflow-text (<2.14)", "tf2onnx", "timm", "tokenizers (>=0.11.1,!=0.11.3,<0.14)", "torch (>=1.9,!=1.12.0)", "torchaudio", "torchvision"] audio = ["kenlm", "librosa", "phonemizer", "pyctcdecode (>=0.4.0)"] codecarbon = ["codecarbon (==1.2.0)"] deepspeed = ["accelerate (>=0.20.3)", "deepspeed (>=0.9.3)"] deepspeed-testing = ["GitPython (<3.1.19)", "accelerate (>=0.20.3)", "beautifulsoup4", "black (>=23.1,<24.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "deepspeed (>=0.9.3)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "hf-doc-builder (>=0.3.0)", "nltk", "optuna", "parameterized", "protobuf", "psutil", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "sentencepiece (>=0.1.91,!=0.1.92)", "timeout-decorator"] -dev = ["GitPython (<3.1.19)", "Pillow (<10.0.0)", "accelerate (>=0.20.3)", "av (==9.2.0)", "beautifulsoup4", "black (>=23.1,<24.0)", "codecarbon (==1.2.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "decord (==0.6.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "flax (>=0.4.1,<=0.7.0)", "fugashi (>=1.0)", "hf-doc-builder", "hf-doc-builder (>=0.3.0)", "ipadic (>=1.0.0,<2.0)", "isort (>=5.5.4)", "jax (>=0.2.8,!=0.3.2,<=0.4.13)", "jaxlib (>=0.1.65,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "nltk", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "parameterized", "phonemizer", "protobuf", "psutil", "pyctcdecode (>=0.4.0)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "ray[tune]", "rhoknp (>=1.1.0,<1.3.1)", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (>=0.0.241,<=0.0.259)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "scikit-learn", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "sudachidict-core (>=20220729)", "sudachipy (>=0.6.6)", "tensorflow (>=2.6,<2.14)", "tensorflow-text (<2.14)", "tf2onnx", "timeout-decorator", "timm", "tokenizers (>=0.11.1,!=0.11.3,<0.14)", "torch (>=1.9,!=1.12.0)", "torchaudio", "torchvision", "unidic (>=1.0.2)", "unidic-lite (>=1.0.7)", "urllib3 (<2.0.0)"] +dev = ["GitPython (<3.1.19)", "Pillow (<10.0.0)", "accelerate (>=0.20.3)", "av (==9.2.0)", "beautifulsoup4", "black (>=23.1,<24.0)", "codecarbon (==1.2.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "decord (==0.6.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "flax (>=0.4.1,<=0.7.0)", "fugashi (>=1.0)", "hf-doc-builder", "hf-doc-builder (>=0.3.0)", "ipadic (>=1.0.0,<2.0)", "isort (>=5.5.4)", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "nltk", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "parameterized", "phonemizer", "protobuf", "psutil", "pyctcdecode (>=0.4.0)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "ray[tune]", "rhoknp (>=1.1.0,<1.3.1)", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (>=0.0.241,<=0.0.259)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "scikit-learn", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "sudachidict-core (>=20220729)", "sudachipy (>=0.6.6)", "tensorflow (>=2.6,<2.14)", "tensorflow-text (<2.14)", "tf2onnx", "timeout-decorator", "timm", "tokenizers (>=0.11.1,!=0.11.3,<0.14)", "torch (>=1.9,!=1.12.0)", "torchaudio", "torchvision", "unidic (>=1.0.2)", "unidic-lite (>=1.0.7)", "urllib3 (<2.0.0)"] dev-tensorflow = ["GitPython (<3.1.19)", "Pillow (<10.0.0)", "beautifulsoup4", "black (>=23.1,<24.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "hf-doc-builder", "hf-doc-builder (>=0.3.0)", "isort (>=5.5.4)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "nltk", "onnxconverter-common", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)", "parameterized", "phonemizer", "protobuf", "psutil", "pyctcdecode (>=0.4.0)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (>=0.0.241,<=0.0.259)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "scikit-learn", "sentencepiece (>=0.1.91,!=0.1.92)", "tensorflow (>=2.6,<2.14)", "tensorflow-text (<2.14)", "tf2onnx", "timeout-decorator", "tokenizers (>=0.11.1,!=0.11.3,<0.14)", "urllib3 (<2.0.0)"] dev-torch = ["GitPython (<3.1.19)", "Pillow (<10.0.0)", "accelerate (>=0.20.3)", "beautifulsoup4", "black (>=23.1,<24.0)", "codecarbon (==1.2.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "fugashi (>=1.0)", "hf-doc-builder", "hf-doc-builder (>=0.3.0)", "ipadic (>=1.0.0,<2.0)", "isort (>=5.5.4)", "kenlm", "librosa", "nltk", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)", "optuna", "parameterized", "phonemizer", "protobuf", "psutil", "pyctcdecode (>=0.4.0)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "ray[tune]", "rhoknp (>=1.1.0,<1.3.1)", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (>=0.0.241,<=0.0.259)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "scikit-learn", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "sudachidict-core (>=20220729)", "sudachipy (>=0.6.6)", "timeout-decorator", "timm", "tokenizers (>=0.11.1,!=0.11.3,<0.14)", "torch (>=1.9,!=1.12.0)", "torchaudio", "torchvision", "unidic (>=1.0.2)", "unidic-lite (>=1.0.7)", "urllib3 (<2.0.0)"] -docs = ["Pillow (<10.0.0)", "accelerate (>=0.20.3)", "av (==9.2.0)", "codecarbon (==1.2.0)", "decord (==0.6.0)", "flax (>=0.4.1,<=0.7.0)", "hf-doc-builder", "jax (>=0.2.8,!=0.3.2,<=0.4.13)", "jaxlib (>=0.1.65,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "phonemizer", "protobuf", "pyctcdecode (>=0.4.0)", "ray[tune]", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "tensorflow (>=2.6,<2.14)", "tensorflow-text (<2.14)", "tf2onnx", "timm", "tokenizers (>=0.11.1,!=0.11.3,<0.14)", "torch (>=1.9,!=1.12.0)", "torchaudio", "torchvision"] +docs = ["Pillow (<10.0.0)", "accelerate (>=0.20.3)", "av (==9.2.0)", "codecarbon (==1.2.0)", "decord (==0.6.0)", "flax (>=0.4.1,<=0.7.0)", "hf-doc-builder", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "phonemizer", "protobuf", "pyctcdecode (>=0.4.0)", "ray[tune]", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "tensorflow (>=2.6,<2.14)", "tensorflow-text (<2.14)", "tf2onnx", "timm", "tokenizers (>=0.11.1,!=0.11.3,<0.14)", "torch (>=1.9,!=1.12.0)", "torchaudio", "torchvision"] docs-specific = ["hf-doc-builder"] fairscale = ["fairscale (>0.3)"] -flax = ["flax (>=0.4.1,<=0.7.0)", "jax (>=0.2.8,!=0.3.2,<=0.4.13)", "jaxlib (>=0.1.65,<=0.4.13)", "optax (>=0.0.8,<=0.1.4)"] +flax = ["flax (>=0.4.1,<=0.7.0)", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "optax (>=0.0.8,<=0.1.4)"] flax-speech = ["kenlm", "librosa", "phonemizer", "pyctcdecode (>=0.4.0)"] ftfy = ["ftfy"] integrations = ["optuna", "ray[tune]", "sigopt"] @@ -6778,7 +6784,7 @@ tokenizers = ["tokenizers (>=0.11.1,!=0.11.3,<0.14)"] torch = ["accelerate (>=0.20.3)", "torch (>=1.9,!=1.12.0)"] torch-speech = ["kenlm", "librosa", "phonemizer", "pyctcdecode (>=0.4.0)", "torchaudio"] torch-vision = ["Pillow (<10.0.0)", "torchvision"] -torchhub = ["filelock", "huggingface-hub (>=0.14.1,<1.0)", "importlib-metadata", "numpy (>=1.17)", "packaging (>=20.0)", "protobuf", "regex (!=2019.12.17)", "requests", "sentencepiece (>=0.1.91,!=0.1.92)", "tokenizers (>=0.11.1,!=0.11.3,<0.14)", "torch (>=1.9,!=1.12.0)", "tqdm (>=4.27)"] +torchhub = ["filelock", "huggingface-hub (>=0.15.1,<1.0)", "importlib-metadata", "numpy (>=1.17)", "packaging (>=20.0)", "protobuf", "regex (!=2019.12.17)", "requests", "sentencepiece (>=0.1.91,!=0.1.92)", "tokenizers (>=0.11.1,!=0.11.3,<0.14)", "torch (>=1.9,!=1.12.0)", "tqdm (>=4.27)"] video = ["av (==9.2.0)", "decord (==0.6.0)"] vision = ["Pillow (<10.0.0)"] @@ -7158,13 +7164,13 @@ files = [ [[package]] name = "weaviate-client" -version = "3.22.1" +version = "3.23.0" description = "A python native Weaviate client" optional = false python-versions = ">=3.8" files = [ - {file = "weaviate-client-3.22.1.tar.gz", hash = "sha256:aff61bd3f5d74df20a62328443e3aa9c860d5330fdfb19c4d8ddc44cb604032f"}, - {file = "weaviate_client-3.22.1-py3-none-any.whl", hash = "sha256:01843a4899a227300e570409e77628e9d1b28476313f94943c37aee3f75112e1"}, + {file = "weaviate-client-3.23.0.tar.gz", hash = "sha256:3ffd7f1460c9e32755d84d4f5fc63dfc0bd990dbe2c3dc20d5c68119d467680e"}, + {file = "weaviate_client-3.23.0-py3-none-any.whl", hash = "sha256:3d3bb75c1d96b2b71e213c5eb885ae3e3f42e4304955383c467d100187d9ff8e"}, ] [package.dependencies] @@ -7189,17 +7195,17 @@ files = [ [[package]] name = "websocket-client" -version = "1.6.1" +version = "1.6.2" description = "WebSocket client for Python with low level API options" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "websocket-client-1.6.1.tar.gz", hash = "sha256:c951af98631d24f8df89ab1019fc365f2227c0892f12fd150e935607c79dd0dd"}, - {file = "websocket_client-1.6.1-py3-none-any.whl", hash = "sha256:f1f9f2ad5291f0225a49efad77abf9e700b6fef553900623060dad6e26503b9d"}, + {file = "websocket-client-1.6.2.tar.gz", hash = "sha256:53e95c826bf800c4c465f50093a8c4ff091c7327023b10bfaff40cf1ef170eaa"}, + {file = "websocket_client-1.6.2-py3-none-any.whl", hash = "sha256:ce54f419dfae71f4bdba69ebe65bf7f0a93fe71bc009ad3a010aacc3eebad537"}, ] [package.extras] -docs = ["Sphinx (>=3.4)", "sphinx-rtd-theme (>=0.5)"] +docs = ["Sphinx (>=6.0)", "sphinx-rtd-theme (>=1.1.0)"] optional = ["python-socks", "wsaccel"] test = ["websockets"] @@ -7283,13 +7289,13 @@ files = [ [[package]] name = "wheel" -version = "0.41.1" +version = "0.41.2" description = "A built-package format for Python" optional = false python-versions = ">=3.7" files = [ - {file = "wheel-0.41.1-py3-none-any.whl", hash = "sha256:473219bd4cbedc62cea0cb309089b593e47c15c4a2531015f94e4e3b9a0f6981"}, - {file = "wheel-0.41.1.tar.gz", hash = "sha256:12b911f083e876e10c595779709f8a88a59f45aacc646492a67fe9ef796c1b47"}, + {file = "wheel-0.41.2-py3-none-any.whl", hash = "sha256:75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8"}, + {file = "wheel-0.41.2.tar.gz", hash = "sha256:0c5ac5ff2afb79ac23ab82bab027a0be7b5dbcf2e54dc50efe4bf507de1f7985"}, ] [package.extras] diff --git a/pyproject.toml b/pyproject.toml index 9541dd0dc..1475ef5ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "langflow" -version = "0.4.12" +version = "0.4.13" description = "A Python package with a built-in web application" authors = ["Logspace "] maintainers = [ From ada752309a1e16c43ea260e33f6ebe085abeb23c Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Tue, 22 Aug 2023 21:49:37 -0300 Subject: [PATCH 059/134] =?UTF-8?q?=F0=9F=90=9B=20fix(App.tsx):=20add=20se?= =?UTF-8?q?tIsAdmin=20function=20to=20AuthContext=20to=20update=20isAdmin?= =?UTF-8?q?=20state=20when=20user=20data=20is=20fetched=20=E2=9C=A8=20feat?= =?UTF-8?q?(App.tsx):=20set=20isAdmin=20state=20based=20on=20user's=20is?= =?UTF-8?q?=5Fsuperuser=20value=20to=20conditionally=20render=20admin-rela?= =?UTF-8?q?ted=20components=20=F0=9F=90=9B=20fix(headerComponent/index.tsx?= =?UTF-8?q?):=20fix=20conditional=20rendering=20of=20Sign=20out,=20Home,?= =?UTF-8?q?=20and=20Admin=20page=20buttons=20based=20on=20autoLogin=20and?= =?UTF-8?q?=20isAdmin=20values=20=F0=9F=90=9B=20fix(authContext.tsx):=20re?= =?UTF-8?q?move=20unnecessary=20useEffect=20to=20update=20isAdmin=20state?= =?UTF-8?q?=20when=20accessToken=20or=20isAdmin=20changes=20=F0=9F=94=A5?= =?UTF-8?q?=20chore(api.tsx):=20remove=20unused=20sleep=20function=20?= =?UTF-8?q?=E2=9C=A8=20feat(AdminPage/index.tsx):=20update=20text=20in=20A?= =?UTF-8?q?dminPage=20to=20provide=20a=20better=20description=20of=20the?= =?UTF-8?q?=20page's=20purpose=20=F0=9F=90=9B=20fix(routes.tsx):=20wrap=20?= =?UTF-8?q?AdminPage=20and=20ApiKeysPage=20components=20with=20ProtectedAd?= =?UTF-8?q?minRoute=20component=20to=20restrict=20access=20to=20admin-only?= =?UTF-8?q?=20routes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/App.tsx | 4 +- .../src/components/headerComponent/index.tsx | 60 ++++++++++--------- src/frontend/src/contexts/authContext.tsx | 8 --- src/frontend/src/controllers/API/api.tsx | 4 -- src/frontend/src/pages/AdminPage/index.tsx | 2 +- src/frontend/src/routes.tsx | 8 +-- 6 files changed, 40 insertions(+), 46 deletions(-) diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx index 057a16fff..e9c58934f 100644 --- a/src/frontend/src/App.tsx +++ b/src/frontend/src/App.tsx @@ -134,7 +134,7 @@ export default function App() { }; //this function is to get the user logged in when the page is refreshed - const { setUserData, getAuthentication, login, setAutoLogin, logout } = + const { setUserData, getAuthentication, login, setAutoLogin, logout, setIsAdmin } = useContext(AuthContext); useEffect(() => { @@ -154,6 +154,8 @@ export default function App() { .then((user) => { setUserData(user); setLoading(false); + const isSuperUser = user.is_superuser; + setIsAdmin(isSuperUser); }) .catch((error) => {}); } diff --git a/src/frontend/src/components/headerComponent/index.tsx b/src/frontend/src/components/headerComponent/index.tsx index 11c1507a3..25e4dc34f 100644 --- a/src/frontend/src/components/headerComponent/index.tsx +++ b/src/frontend/src/components/headerComponent/index.tsx @@ -26,34 +26,37 @@ export default function Header(): JSX.Element { ⛓️ - {location.pathname === "/admin" && ( - - )} + {autoLogin === false && ( - + + )} + + {location.pathname === "/admin" && ( + { + navigate("/"); + }} + className="text-sm font-medium text-muted-foreground transition-colors hover:text-primary cursor-pointer" + > + Home + )} {isAdmin && !autoLogin && location.pathname !== "/admin" && ( - + )} {flows.findIndex((f) => tabId === f.id) !== -1 && tabId !== "" && ( @@ -138,17 +141,18 @@ export default function Header(): JSX.Element { />
- - + {!autoLogin && ( + + )}
diff --git a/src/frontend/src/contexts/authContext.tsx b/src/frontend/src/contexts/authContext.tsx index 1fcfef58e..4fdca3ad0 100644 --- a/src/frontend/src/contexts/authContext.tsx +++ b/src/frontend/src/contexts/authContext.tsx @@ -47,14 +47,6 @@ export function AuthProvider({ children }): React.ReactElement { fetchStars(); }, []); - useEffect(() => { - if (accessToken) { - getLoggedUser().then((user) => { - const isSuperUser = user.is_superuser; - setIsAdmin(isSuperUser); - }); - } - }, [accessToken, isAdmin]); function getAuthentication() { const storedRefreshToken = cookies.get("refresh_token"); diff --git a/src/frontend/src/controllers/API/api.tsx b/src/frontend/src/controllers/API/api.tsx index 2d05228cc..fc4358ed0 100644 --- a/src/frontend/src/controllers/API/api.tsx +++ b/src/frontend/src/controllers/API/api.tsx @@ -103,9 +103,5 @@ function ApiInterceptor() { return null; } -// Function to sleep for a given duration in milliseconds -function sleep(ms: number) { - return new Promise((resolve) => setTimeout(resolve, ms)); -} export { ApiInterceptor, api }; diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx index 64b766416..83f79a25e 100644 --- a/src/frontend/src/pages/AdminPage/index.tsx +++ b/src/frontend/src/pages/AdminPage/index.tsx @@ -196,7 +196,7 @@ export default function AdminPage() { Welcome back!

- Here's a list of all users! + Navigate through this section to efficiently oversee all application users. From here, you can seamlessly manage user accounts.

diff --git a/src/frontend/src/routes.tsx b/src/frontend/src/routes.tsx index 04e2f80f4..9b1d35b55 100644 --- a/src/frontend/src/routes.tsx +++ b/src/frontend/src/routes.tsx @@ -88,9 +88,9 @@ const Router = () => { - + } /> @@ -106,9 +106,9 @@ const Router = () => { + - + } > From b4a01ad93493e17d0a99749dc6b5a1c03fcb9e27 Mon Sep 17 00:00:00 2001 From: Cristhian Zanforlin Lousa Date: Tue, 22 Aug 2023 22:14:46 -0300 Subject: [PATCH 060/134] =?UTF-8?q?=F0=9F=94=A7=20fix(tabsContext.tsx):=20?= =?UTF-8?q?add=20setSuccessData=20to=20useContext=20to=20fix=20missing=20f?= =?UTF-8?q?unction=20error=20=E2=9C=A8=20feat(tabsContext.tsx):=20add=20su?= =?UTF-8?q?ccess=20alert=20when=20changes=20are=20saved=20successfully=20i?= =?UTF-8?q?n=20TabsProvider=20component=20=F0=9F=94=A7=20fix(flowSettingsM?= =?UTF-8?q?odal/index.tsx):=20remove=20setSuccessData=20from=20useContext?= =?UTF-8?q?=20to=20fix=20missing=20function=20error=20=F0=9F=94=A7=20fix(A?= =?UTF-8?q?dminPage/index.tsx):=20remove=20console.log=20statement=20?= =?UTF-8?q?=E2=9C=A8=20feat(AdminPage/index.tsx):=20add=20success=20alert?= =?UTF-8?q?=20when=20user=20is=20edited=20successfully=20=F0=9F=94=A7=20fi?= =?UTF-8?q?x(extraSidebarComponent/index.tsx):=20remove=20setSuccessData?= =?UTF-8?q?=20from=20useContext=20to=20fix=20missing=20function=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/contexts/tabsContext.tsx | 3 ++- src/frontend/src/modals/flowSettingsModal/index.tsx | 2 -- src/frontend/src/pages/AdminPage/index.tsx | 2 -- .../pages/FlowPage/components/extraSidebarComponent/index.tsx | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/frontend/src/contexts/tabsContext.tsx b/src/frontend/src/contexts/tabsContext.tsx index 67231f4e5..5c48e6e5b 100644 --- a/src/frontend/src/contexts/tabsContext.tsx +++ b/src/frontend/src/contexts/tabsContext.tsx @@ -68,7 +68,7 @@ export const TabsContext = createContext( ); export function TabsProvider({ children }: { children: ReactNode }) { - const { setErrorData, setNoticeData } = useContext(alertContext); + const { setErrorData, setNoticeData, setSuccessData } = useContext(alertContext); const [tabId, setTabId] = useState(""); @@ -579,6 +579,7 @@ export function TabsProvider({ children }: { children: ReactNode }) { const updatedFlow = await updateFlowInDatabase(newFlow); if (updatedFlow) { // updates flow in state + setSuccessData({ title: "Changes saved successfully" }); setFlows((prevState) => { const newFlows = [...prevState]; const index = newFlows.findIndex((flow) => flow.id === newFlow.id); diff --git a/src/frontend/src/modals/flowSettingsModal/index.tsx b/src/frontend/src/modals/flowSettingsModal/index.tsx index 075f0a651..ed91f5dbb 100644 --- a/src/frontend/src/modals/flowSettingsModal/index.tsx +++ b/src/frontend/src/modals/flowSettingsModal/index.tsx @@ -12,7 +12,6 @@ export default function FlowSettingsModal({ open, setOpen, }: FlowSettingsPropsType): JSX.Element { - const { setSuccessData } = useContext(alertContext); const { flows, tabId, updateFlow, saveFlow } = useContext(TabsContext); const flow = flows.find((f) => f.id === tabId); useEffect(() => { @@ -28,7 +27,6 @@ export default function FlowSettingsModal({ savedFlow!.name = name; savedFlow!.description = description; saveFlow(savedFlow!); - setSuccessData({ title: "Changes saved successfully" }); setOpen(false); } return ( diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx index 64b766416..00e2099fd 100644 --- a/src/frontend/src/pages/AdminPage/index.tsx +++ b/src/frontend/src/pages/AdminPage/index.tsx @@ -133,8 +133,6 @@ export default function AdminPage() { updateUser(userId, userEdit) .then((res) => { - console.log(res); - resetFilter(); setSuccessData({ title: "Success! User edited!", diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx index f8ac36230..d4d3ee832 100644 --- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx @@ -21,7 +21,7 @@ export default function ExtraSidebar(): JSX.Element { const { data, templates } = useContext(typesContext); const { flows, tabId, uploadFlow, tabsState, saveFlow, isBuilt } = useContext(TabsContext); - const { setSuccessData, setErrorData } = useContext(alertContext); + const { setErrorData } = useContext(alertContext); const [dataFilter, setFilterData] = useState(data); const [search, setSearch] = useState(""); const isPending = tabsState[tabId]?.isPending; @@ -121,7 +121,6 @@ export default function ExtraSidebar(): JSX.Element { } onClick={(event) => { saveFlow(flow!); - setSuccessData({ title: "Changes saved successfully" }); }} > Date: Wed, 23 Aug 2023 12:52:49 -0300 Subject: [PATCH 061/134] fix(App.tsx): remove extra comma in the useContext hook feat(App.tsx): add support for displaying fetch error message when there is an error in the backend API call fix(typesContext.tsx): add error handling for API call and set fetchError state accordingly feat(typesContext.tsx): add fetchError state and setFetchError function to the typesContext --- src/frontend/src/App.tsx | 8 +++++++- src/frontend/src/contexts/typesContext.tsx | 14 ++++++++++++-- src/frontend/src/types/typesContext/index.ts | 2 ++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx index 467e15ed8..5bda7ff37 100644 --- a/src/frontend/src/App.tsx +++ b/src/frontend/src/App.tsx @@ -13,6 +13,7 @@ import LoadingComponent from "./components/loadingComponent"; import { alertContext } from "./contexts/alertContext"; import { locationContext } from "./contexts/locationContext"; import { TabsContext } from "./contexts/tabsContext"; +import { typesContext } from "./contexts/typesContext"; import Router from "./routes"; export default function App() { @@ -38,6 +39,7 @@ export default function App() { setSuccessOpen, loading, } = useContext(alertContext); + const { fetchError } = useContext(typesContext); // Initialize state variable for the list of alerts const [alertsList, setAlertsList] = useState< @@ -137,7 +139,11 @@ export default function App() { > {loading ? (
- + {fetchError ? ( +
There was an error on the backend
+ ) : ( + + )}
) : ( <> diff --git a/src/frontend/src/contexts/typesContext.tsx b/src/frontend/src/contexts/typesContext.tsx index ecdfb95a9..8f18b062c 100644 --- a/src/frontend/src/contexts/typesContext.tsx +++ b/src/frontend/src/contexts/typesContext.tsx @@ -6,7 +6,7 @@ import { useState, } from "react"; import { Node } from "reactflow"; -import { getAll } from "../controllers/API"; +import { getAll, getHealth } from "../controllers/API"; import { APIKindType } from "../types/api"; import { typesContextType } from "../types/typesContext"; import { alertContext } from "./alertContext"; @@ -23,6 +23,8 @@ const initialValue: typesContextType = { setTemplates: () => {}, data: {}, setData: () => {}, + setFetchError: () => {}, + fetchError: false, }; export const typesContext = createContext(initialValue); @@ -32,6 +34,7 @@ export function TypesProvider({ children }: { children: ReactNode }) { const [reactFlowInstance, setReactFlowInstance] = useState(null); const [templates, setTemplates] = useState({}); const [data, setData] = useState({}); + const [fetchError, setFetchError] = useState(false); const { setLoading } = useContext(alertContext); useEffect(() => { @@ -46,8 +49,13 @@ export function TypesProvider({ children }: { children: ReactNode }) { async function getTypes(): Promise { try { const result = await getAll(); + if (result?.status !== 200) { + let health = await getHealth().catch((e) => { + setFetchError(true); + }); + } // Make sure to only update the state if the component is still mounted. - if (isMounted) { + if (isMounted && result?.status === 200) { setLoading(false); setData(result.data); setTemplates( @@ -117,6 +125,8 @@ export function TypesProvider({ children }: { children: ReactNode }) { templates, data, setData, + fetchError, + setFetchError, }} > {children} diff --git a/src/frontend/src/types/typesContext/index.ts b/src/frontend/src/types/typesContext/index.ts index 64b6e3e9d..57b64d7e2 100644 --- a/src/frontend/src/types/typesContext/index.ts +++ b/src/frontend/src/types/typesContext/index.ts @@ -15,4 +15,6 @@ export type typesContextType = { setTemplates: (newState: {}) => void; data: typeof data; setData: (newState: {}) => void; + fetchError: boolean; + setFetchError: (newState: boolean) => void; }; From ea105ee7afa40557a538c90111ff4ca43bb12b7d Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Wed, 23 Aug 2023 14:44:45 -0300 Subject: [PATCH 062/134] refactor(typesContext.tsx): remove unnecessary retry logic and interval for fetching types fix(typesContext.tsx): fix issue where component was not unmounting properly and causing memory leaks --- src/frontend/src/contexts/typesContext.tsx | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/frontend/src/contexts/typesContext.tsx b/src/frontend/src/contexts/typesContext.tsx index 8f18b062c..bcaf67bf1 100644 --- a/src/frontend/src/contexts/typesContext.tsx +++ b/src/frontend/src/contexts/typesContext.tsx @@ -38,11 +38,6 @@ export function TypesProvider({ children }: { children: ReactNode }) { const { setLoading } = useContext(alertContext); useEffect(() => { - let delay = 1000; // Start delay of 1 second - let intervalId = null; - let retryCount = 0; // Count of retry attempts - const maxRetryCount = 5; // Max retry attempts - // We will keep a flag to handle the case where the component is unmounted before the API call resolves. let isMounted = true; @@ -85,22 +80,13 @@ export function TypesProvider({ children }: { children: ReactNode }) { }, {}) ); } - // Clear the interval if successful. - clearInterval(intervalId); } catch (error) { console.error("An error has occurred while fetching types."); } } // Start the initial interval. - intervalId = setInterval(getTypes, delay); - - return () => { - // This will clear the interval when the component unmounts, or when the dependencies of the useEffect hook change. - clearInterval(intervalId); - // Indicate that the component has been unmounted. - isMounted = false; - }; + getTypes(); }, []); function deleteNode(idx: string) { From d9b03980f7609ccea434adec4a07e13ff8ed6c6a Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Wed, 23 Aug 2023 14:59:20 -0300 Subject: [PATCH 063/134] fix(typesContext.tsx): remove unnecessary code that checks result status and fetches health on error fix(typesContext.tsx): handle error when fetching types and set fetchError state to true --- src/frontend/src/contexts/typesContext.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/frontend/src/contexts/typesContext.tsx b/src/frontend/src/contexts/typesContext.tsx index bcaf67bf1..189f61af0 100644 --- a/src/frontend/src/contexts/typesContext.tsx +++ b/src/frontend/src/contexts/typesContext.tsx @@ -44,11 +44,6 @@ export function TypesProvider({ children }: { children: ReactNode }) { async function getTypes(): Promise { try { const result = await getAll(); - if (result?.status !== 200) { - let health = await getHealth().catch((e) => { - setFetchError(true); - }); - } // Make sure to only update the state if the component is still mounted. if (isMounted && result?.status === 200) { setLoading(false); @@ -82,10 +77,13 @@ export function TypesProvider({ children }: { children: ReactNode }) { } } catch (error) { console.error("An error has occurred while fetching types."); + await getHealth().catch((e) => { + console.log("entrou"); + setFetchError(true); + }); } } - // Start the initial interval. getTypes(); }, []); From 0ffdaa00a5a6126360a14a4a5185ed2ce9d9c622 Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Wed, 23 Aug 2023 17:39:34 -0300 Subject: [PATCH 064/134] Fix: Backspace doesnt work on tweak page --- docker-compose.debug.yml | 66 ++++++------- docs/static/img/logo.svg | Bin 32058 -> 32057 bytes docs/static/img/new_langflow.gif | Bin 3359024 -> 3358955 bytes docs/static/img/new_langflow2.gif | Bin 3347758 -> 3347695 bytes docs/static/videos/langflow_api.mp4 | Bin 7840168 -> 7840060 bytes docs/static/videos/langflow_build.mp4 | Bin 3068195 -> 3068141 bytes docs/static/videos/langflow_collection.mp4 | Bin 6268299 -> 6268218 bytes .../videos/langflow_collection_example.mp4 | Bin 11838852 -> 11838650 bytes docs/static/videos/langflow_fork.mp4 | Bin 27353248 -> 27352839 bytes docs/static/videos/langflow_parameters.mp4 | Bin 10686123 -> 10685953 bytes .../components/AccordionComponent/index.tsx | 4 +- .../components/codeTabsComponent/index.tsx | 91 ++++-------------- 12 files changed, 53 insertions(+), 108 deletions(-) diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml index 6a9802e38..c73ff2a60 100644 --- a/docker-compose.debug.yml +++ b/docker-compose.debug.yml @@ -1,33 +1,33 @@ -version: "3.4" - -services: - backend: - volumes: - - ./:/app - build: - context: ./ - dockerfile: ./dev.Dockerfile - command: - [ - "sh", - "-c", - "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m uvicorn --factory src.backend.langflow.main:create_app --host 0.0.0.0 --port 7860 --reload", - ] - ports: - - 7860:7860 - - 5678:5678 - restart: on-failure - - frontend: - build: - context: ./src/frontend - dockerfile: ./dev.Dockerfile - args: - - BACKEND_URL=http://backend:7860 - ports: - - "3000:3000" - volumes: - - ./src/frontend/public:/home/node/app/public - - ./src/frontend/src:/home/node/app/src - - ./src/frontend/package.json:/home/node/app/package.json - restart: on-failure +version: "3.4" + +services: + backend: + volumes: + - ./:/app + build: + context: ./ + dockerfile: ./dev.Dockerfile + command: + [ + "sh", + "-c", + "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m uvicorn --factory src.backend.langflow.main:create_app --host 0.0.0.0 --port 7860 --reload", + ] + ports: + - 7860:7860 + - 5678:5678 + restart: on-failure + + frontend: + build: + context: ./src/frontend + dockerfile: ./dev.Dockerfile + args: + - BACKEND_URL=http://backend:7860 + ports: + - "3000:3000" + volumes: + - ./src/frontend/public:/home/node/app/public + - ./src/frontend/src:/home/node/app/src + - ./src/frontend/package.json:/home/node/app/package.json + restart: on-failure diff --git a/docs/static/img/logo.svg b/docs/static/img/logo.svg index 136c4c835821060875515cb91d27b1f056e9b95f..3972c658bbf186d4864aa945bcabab384ac91f39 100644 GIT binary patch delta 15 Wcmdn>i*e^KMwZS1KlhESrnLY$uLeW_ delta 16 Xcmdn_i*eU4M%K;%KX=}ZET**pKF|hH diff --git a/docs/static/img/new_langflow.gif b/docs/static/img/new_langflow.gif index 18b3389f3627bc2ee1518ec5c1e103fb5172e801..6323d20df1d757e398c0cad9d1c266fffb6dbcb6 100644 GIT binary patch delta 526 zcmWN=Uq};i00(fUo7y(Lb93|0Ztga>%WZcqS86#QR!|7@p)^OZw1-s4{urjF{ZZ8L z7ZnteIuL?PUyMjP=nFwXWG+eJu$Q(5K9phNe1C)f-*-Q=ze` z3FFs*@oN*ep;^>MDXe|gKJUa>Ap83W8Cc1d=U`xkstQd&pevCO=mTMtEYMy(2}WrI zqq*+|Fqyi-{iv+gUG!r5g6`8<(ktoEE9nDuWS+^xJY%?g3KiXkgZ;Sl%P>%n#8IQU z3fh}SdmqYw8*9^WZO52=h4W(m>=cZ_f)7W?YPbNa;lliP*bWsXa>#mn5!TyHGpBJc zVwzFGyKK7i6t8=kW|1(w84O=6P7*0n3@KuHtVHLMWv~#NYnE*aKesHo0i^tFS01i3 zvM-z95?Mnn{C`=h2FI(cdJZj3)~km|eB3Ix$x9F)x4+rMrOuh^LtZq!e7{}aC8L`pc8j)^JHMiq(m8;=}1c@~v2*lu|UZe)DAo8OmS*Wmu zU6fHe3xYnpQHHXCFL)72wJ9WsQEci(Sb|ZEkybXD_20#x-+P|t;eqp>^L=26ni)jg z9K{T|xd23RkX+*CL{C>KCJ;}HNIadF(o+msQ0KpBN6qWYCthE{qjie$3kUqd!C8T( zJ1{`c(_7u}=W(%-#-O}bOysqN$vdd!EEXmta4lXqeH{*am~Vc}bgg7lM7mZaE`egk zCV93R?aw@WEC}UM)>(|Px&%w=64G}(YT^Q!<|s6|WmlbWlD{6pl|3=obbV>ZN=^L@Y89f-UYY&m8L$Z`mLsO=9qzT(;g8yN?3gluH0 Nc>GF4vg%y#_z#Jv>w^FQ diff --git a/docs/static/img/new_langflow2.gif b/docs/static/img/new_langflow2.gif index d963db0b8832d81d249239c974f54f0af91ef2d2..587450de231b9b45a4964dbd86ef1955c78bcf7d 100644 GIT binary patch delta 506 zcmWN>TWC^o00&@>bEbLecxIc<&EsunbLw0Q%{@4>VlaZ3Z6l(G)he){D@M&1!!G}t z$;_Zdu3@wZ87{EPufWwHdT40_gB~Wy=wW+kBtk@ubvX~;H=E8=l}CB%(lhF14_@_9 z%qa4puHPj?{Q_PMhWdp}H~cq*M?@q)E<}F3)_#(#Z`5LaL*(fr?%qv2G2Fe9)$D}+ zw`4bt@!cZnvCTXw(qppJRrqN6mna-l@`I-kkty!1!uUgRahN0qwjeP;-#d)$&*?qQ z2p8#jF?N;cDGpyLrJIJ9QGU{(VpaZJ!itD#Q4<-<@aiCARr6;_A*SMO<<+AQYtSjN z_MqWu0!feB?11WduQ0`*ioyT;BwHrxskwtM)e?m$;B|SVP!@j*FW-%gWF-d)x44S%K z_?$6GLRhw$n-1a6P4jXJWmk)L33>&W@!{hz_f|mSBOKx*t-lVCNUoLF#Q7_CauUOZB-qn-`JiMFc`HTSL5}Jy|M$dEB1Jlcmo|g2fTsK oqY9D=cOn(u_Wl~qNSuhGZNeGgaDUGE*Ne%2&cPZ~1uhTsA5ee$O^S2qh9jnSHz)`u`CV|{-dNiMuE!g{&Vm`Y zxuf)-KUj-U>ZiIb??hN5&}*SUZ_}>}@czXn=rCj@|6=o}7W6FJ&4$vso#Jfs5%5pk zcCQlMXv#*>lzo>+Ht^Q|at-7Yju6g}Vl$4N6X30HjtSgXOcp)@wU8{_+NZ?0f4G(U mhn*ir&^ao1QRz;%CtcyvcY2mwe{rUC`Jd~&7|e*=9_~L3MkkxLct6)-wKKOk|{cqsZHiO=BZfgH*cxj zZOdZURrE%8-pYgX@p?J$M%jqlR!I)0DXo`Xi(6aGxZBR!&p$r@JkR&;``BGG%q!o| zFuRr-TGia{-+m>8Q{+}{q3Hsme?DY_8p*J$`NJ6~;EbHX~ z&s@YB+>Bppctyl0d+JO*kGiEpQpIV^o|WDT%WYxLgHOroA@%n~rT7&7>&0YVXf+wFzBT}Ut zQe}4h2rA~Yy*eV$=1>XJbS(&Zi0xe7x>?AN}=r|UdmlZMa;D+w!2I5Hj zfGUS0t-^8&in|r{3JgY79N@LzSOf(rK$yjDJUYj7^ OmQScQcw0X8rv48SZ_pzE delta 1179 zcmX|>e^8Tk9LH~aKtb4&Q4cYSEg3pO8?Xt}hWy;5AqYZajvtC_gUQ4ZWJMGj2Rlkd z&ywP<^Tee)+iBgvPgfBoY8vG)h*lt>oOIDHu7PxCSJ(Tw?)u}s*Z1C^_viaO&-ceZ zzc|IXho_kR{k+Q)Jb@EG5FcXb@Q!8h*?Rz9JTsyb6B% zjv%lDM5Eh<9&4`dO+>oh%=i}_g{!0{{_*A8e^IlL6Oj-MDvf0 z<{7z%FgM)XYJ$F#E4T;G%6qDt{_-xM; z(35nwC-$#>$b2A_oE`@AZ%f|g-g%}&s+>lSwLS%{BGwvrya2w(8@HB)@4FTU$;fvt z{+D+6Lj|kDu7lsitl4lAb;iGj7{9zo2(RR!JoFsA3U>nZG?WOfr3&}Dnjg8|1J4W| zM7>q0fRdULUS&q^CY}Ro$5RTPpVfz>!DPV>eHAk z)Z*Ssi{v&k^x@YQ=!(tUzX-}Av!;@f=WDZwug#Wz z0&msd*<&VnOJzAwE-jU5)AjI`ecD4Z@XIUO-XYXYojPbUlm|Tr>B-cYpBRHo$I1Ld z+?f&aww$_;?7-|6sDK7$3-4i1sprzxj3oHui(6@YvB;kf?_y?g%L#az>0)RbX{Jkl zU4kF~Luo$uO%CJpt&hdEDp&0m)27?I6b)#^<7M&SQAR_PZNguCqRn?F@+PC?K}YN5Q$9VvFbkkrJg*(1NXu zJ0f^U6L<8k3+jho2GPgo=Kp^gYBZQxM|RTD9uIe60^JQ1=-xZR{UZ#D9I6@cj|Yx= zDQXpLBlH4QuuX>x;m?_yHsbP-Oxv870NNXx)!bsc-fO-zj(nZtMQ9(@IbIq|`WJ&7 B(5V0b diff --git a/docs/static/videos/langflow_build.mp4 b/docs/static/videos/langflow_build.mp4 index 9d068fa01ee23a764d24f9b32c44b871ec4f445a..fffd21aec7ad2ff37eb79b622c8621b2f9fbc0d5 100644 GIT binary patch delta 566 zcmZ9^T}YEr9LI543qi%RSTWuerm z>>>zx(gkhF_6R~suKi$^tPoAIVI>$bA}p($pqnnnB0KIT=;HG~=X*Hkj6IxTene-O zspE;kK!OAk3<3!@93**h3-TiOegG@?xmu3oBbyY|R^%hf{++nItb8$s-91I+Ed0Gi zrx@U3(eyC7N>n)(L9NQfNLO{L8&K(0>T$xSRNzzU+g1`?RU^7u+;AH2_G&)dlOAO? z%_NuAP$g6;a@lQ-)9~KWw%IW>sr`9`^szehvHIpZvf$EV!DYD8h^C<7dN&r|8lpOM zeKCB04u70ys&Morf0n`gBCiY~bHI4bBKd_X>Ve0(gNtR%h_0lpQ{S&z;?;#`<`MopBNvcNNHZ7;^H zn03vD?m6qXUua9&E{!15YJa+nq3R09Co;)ZQdN|Ls>UQ&;~gaHqz3Dx_TU5>cGV4d zNur~Ua#AiNI_hIzlcn3uEl7vWj7?6DJGJP2<-XZOPh+!mSPn^%*KQ3m!jAs)|5~Cw zEBTh(Q-~Nm8;qQOU}odTTx|R>wWqLha(cvE7_6M0FthT;1(D`3-EC&!=6)BA|DGo4 L7c4$=9^cYmI1cZD delta 678 zcmY+8Ur1AN6vw%@yT9(%cDL!hb92+FbGobuE1Cq(h_Hpwh#tn44F(H}5UeB+WmZe* zAsAt5giF=}17&XhVn$GmC=$Acpu`9fvAqbrgzcd}-|Ot5hwu5EbH3-C-)}3iKutYe zpk{*^iX9GSVju}-=!r1J#!A8-QWBWeD8-Vc$4n!G-u5H|$sjq|o>UARfY&D~-cEr> z`jk~Pc=m=eM1eCmm2(fl5UVOleZN*^LVxtSPIV9EFP%#L948ey6;b5W_btfdD{2y7 zsW@~6e!f%lFVD~%Yk`J_*D%Vef^uU!4yXxol4ztkxrsBqi!QU5 zyjb1;hf0ZFj!uckrEshqnBD9Y%E1d3810-qC7zJngHqVp@RTzQOWCJT^}perQwT(C p{Qo8qU7Wm?Y>l{X?>foX<%v!2D7)A)D}Alw=U;Ld@*n^J diff --git a/docs/static/videos/langflow_collection.mp4 b/docs/static/videos/langflow_collection.mp4 index 69d1727769965035fd2889ff2018b9c79f785547..f240d1be041bf6280bf342dab7e0588c5df96cee 100644 GIT binary patch delta 742 zcmWm7Z7dXU90%~Z=sb1jJab1Ujy#3PAZ zKo8}7j{bApnC0L$d=y8VcPK@wj})oF8!bfh2A+)+qdtllH8=VvT0;%*Sq&ImQ~i_5#E&@j}c%8@$(6NchXUX^9Vf{y-A0 z=kimc{;xc;K*1z`wS)bbu^)kW0fmm{-}gHHYB7Y>PDW)U*>Zwp>x6oVs%D%~HREEdL94mM+z@^Cl2y^Y+91h& z2!kar*RUdV-Kn6ZHdn@tIf}$U&O8P1h>Yk-Icm}y%=xi6ywAA zGJecy#vfh10gGxX+73X`_L{9=#hM^h zc-DmUMa5nnQZlgOwcSV($Mil?&VFTT`JlFX!_p+uAU znbs5+u%<}O5|KP7l}TeRGU<@#T>3f)kzqz!JykSkprSc*U>L%%td2q&?a#t!|7F=A Pw&SwLjWLj#y^-(_%~MN< delta 904 zcmWlWYeM$J$`KWLef z8KU5@EH5Wi^nJ?n_-r#4TrFU8#^BmHHr;^(nInEi7Eh~;}?Y=#|5*XW@HJfqm-cH zrtBem5MzG#BFybJe|{T&an-uVUaJVPAVr8}=R-_yPFT|Bgw=;})aU}!6umPVC?nTQ{JRts{>Dws%%KAvh~)ZqxQ7>(qhVV zcEFybI)`a3&W12Y;6#Qn=SeHf4auF|-yvV*y3it5_$mfYh*c#jGrMUQd(6)Bqi3cq&qH{QUC zuFW3=fa9cV6L;d1DA6VGXB8Z-4IKP|nT`4&+Nck1_eWjX8w^6g32+jG0tpBM;Z)fx zT~%Q&)*z)=!>Mnd@f=@$#5yinYxIgFqgPahEow#*MT{g`R)D&pDH_C3LsM*x5c7t< z*ty^EXiuDjH~LG{aX>~(({foGi#Nzo#+z<|Qx;F0vINmKM#ZU#+t$c<>O|tHlQiFv zRWZy<{4w%aWe)DaLUnS`B{+F1`MRk;F{H3~3eTpcRFuMEU5aZx%=o3U@fxjSG!>+g zVl@3t0P?>Z>BAAohio%w$Tri`bo*nCncy^yH7cDlab8|gf-G1+*3o h3?o~KDeky}thB$FO8YO!O>@sOOU5nXy!?`#tpA4oQ5OIJ diff --git a/docs/static/videos/langflow_collection_example.mp4 b/docs/static/videos/langflow_collection_example.mp4 index e58ea31e4ac55b1c7568fb0b4b7ab87fdca09fe2..31cc949613d08df410ffda5c9195e9ea64faba46 100644 GIT binary patch delta 1654 zcmZY0eLNI)0LSr{>hg5xA_;LN#}O$xp}IWg$gxNsIwy4M2$_HD-H{OA zSbg}$8a$c{TakgjHMnwv{7$rS3^l0;Q5v$pMcQs=0Smv%na{4{;W{Ia5G*V39e0y$p0H0d*~Eh6eG~2}d|+_eF50n02JM;&ycu+%{zFUE&@9Z5p7|`KNK1J7a&IJ?fWH@Bo;{FPUN(EBd9IiXS zZpfiaiIF%*>umC5*bz^Lxw##X6gZ9Pwr?zUvLyUQC(0T8#+7GW;q%QZmIcD5S1Hy) zZsFqm2AV~#&zPicxhv|HuWG*VUqNU=xlyaBHT2;w?;>B-ufbe;x1lFv((?b>sys${%-I;*ic5m}hd|Tj?YD4_$ zeBf8NK8TC*-t}pI*oiqpTF1` zGqQjxEs+$3QzAd!LK4e_~S_F|CUGZ9B%M;}ZCU=Mqot z0MA8a?SjZSk!TgPHyfzd2gS= zmM!;HV<+Sp=D2%Xezp|_nfX@&!9%_*0GiqS>|bCxQSjy|EbhPm=~mozEPUlphV~Xx z2Pp-H_8v-j4(Ftzz~c7I$)X67<#CuQrb>|IQEKHyl(JIl2$V8%(G7l0HDsnx^lIRL7i9Q;yhn$3?K`(GM>R9g(4lS$nIf|eBx(_bZRTtS4Yfd#)18Yug&tBZCseLekj-2C#6_=b;9$X}H zRdYE=30F0Y6CLge=y28ll#o}QYP{9 zJ$58`_6&8F`WV5p=OWT^a(72V0C=4pi!TykVkgxFVPd!aYLZ>ujqK|4Q7ssB*UAs; z8~jxCR54vN-k{b#I%lc=v*Y4CNPD!enMm!`P8lF#SbN41FJEYfw_-qWA+Vbmzq|nB PmlyA^!KCviP4a&MothhS delta 2077 zcmaKsc~q2T6voe}<1)@jBWMaZfXE`^#?Fk2H0&ZSiLwn7V4xtV2_wTQpnd|fs521T zBn$@H0D?7FP0=z5lQ0Ag!xjoVc20CE1dOTZ`TD!lAJ6&S^W68o-}l|`zVG#W54p$h zKjdEKmvICI{4xRu`Z)sTyVx1fOlTH;7t1YK&k<0viu=nH7+E$uy$9@%oYR#6R^6E+ zj0G>*%)Q0>`+uMNARc>ogwG?7aNgH5;VqK!=9z;cB`>1|eA{;Z1-5o$>3qwtK-oTi zrVt!d@?Ug|E*JG!U4Ir zMMu8@vosd1cn5MYx0H*(Lb2s_XVgejEFmkBrY!H958otXd0{X7x&Ujc3s^CD7IE6p z3Q8NYvA0FOj$`|549p+5?JxpexOS-)VDk#Ql3dWW(XP`D9J_DVS_;-j*qf(fkDI;r zbhCG*LI=+|)8WfG96=MWz=8b)UY!H9igTbN z<$^KCjf~xhBiW6t_WO4T7Oi=~M|I5dH59Xa?fH)Xt3;KfnG18qY8|v5a)O-cjFroj z5_=TaxKMG8t1CMQw`aIDb%6=@+}v$I%`a}@>%d8o``z8(jWqXdzk%};JSH8$8D~8n z=&?s%fG70@h+CrJsM_GS5}x;+4N0%T({VRKn@Gp?x=;sy zht{iTCpa|jRTqbRdiZ8a5BJ{t9Pv}{*XXIYRK5Ut$#$v48dMyS7U28ok6dZH8F;Bi z8i*gxjMYkMtkx%ZDLgN|k8&ZrtKB}3FJ0~SOJO@~JL$*OfUDI0LgZ;flm9efokSi$ z5_w?P5qO;b!1ZpR)4ZTm_Mp7058~g#nvS$B)R7h(_&q$so~&oHQ_28+MDGPph^tTg)5d-y25$z2T49mM(i4zL#xbo;u>EJz(N!M6?&y zbUQ{uQPk}yGhYpVBwQw23wjsI+|aVhqm8oTSY~LHk)biVgoo6rw&*qi=zcSL;u^U6 zsN54;2+dP;+a)vjVw3 z*F@@bO=`c5IDaCE@+S^lmLhf%CzF#nWgn)Lsg|cuwftc23B*gE9i*kt4jnp;xbW~{ z=q>076&_CY#^f-csZ!}PRa%c4afO2dI!YA|>3_e#GgTH!Z@dpZ(kl-x27NwPUeto4 zhcd4Ff=&926d!PrAtUuiuy8o@FZMb(`6%n^PH>Zb_7wYW9tX0a94MDO4jhXfN3J3! z&$j@_erO~Qw<0s-k`EO?$7#srgqbJ2iR2T|Nt#GzuCRyhqK2twZ}1@QDX5TwxJ5UY zz@H;3Qn-3!-aM-d$QVg2wN}e17$IVL(iTLZkGNt(I zlzOVvh%GB9FMSKc%8XB!LS-~QU7p8wRAF-lI!g+hbNT~V=XmzqAUpH3(p1?+VBWOK zl^s64y?Q2lF10Cu?gYcvN%$eXQd)yz|i|_+7#0sVlhtniz2|Q%|`}gI5^xo!>Tu8H0<*8m_T? zFk34qH5Twpy*lS5nwq#|oID}0_;%I@g33{q*6+U(jE`DNKI+EZo3M3te@5>JIeR<`v6H;cY-hW5=4+gL|^#A|> diff --git a/docs/static/videos/langflow_fork.mp4 b/docs/static/videos/langflow_fork.mp4 index 03c280c35dc720b1aff4199f35a568cb4c6020e2..c9b75bc2303fc50ee7456583aee46c74f54e70cb 100644 GIT binary patch delta 3743 zcmX}vX;e?!|G@F}X;4bj7bQihG|`~CSED2(DJf~7iBd_5t5IDIH(Q011`V1-niW@l z619^bnd%yHBQE8Nt~7`wlK=ib`9FBQAMCZyI%n;(_CD*BTu+uDt;rJgN>!KDgK4XE>6A=n1y_!7)kQVh>CY(hbqV znGD@WM&x0KE~AGJJM@VmasRH5?%!8j*oC6r20j`Xbi`n8Hi=U(#5e_`aw%N8%qX}R zPu?{;&`pGje?g(*U*ozl@wb)Av3PcLWtA&&urX##7*lkxF@r$jSZBtVqhp=LR|&Lj zu{eH-^n|X$o>0s9jp){FSt^0wJ1oyvU}@OuS(~u(+Ui2<1{*8SLM$t^s*pg3YO5za zqSk7~tU+1&icFfvT1D7mVt0YOR)Yqbw`Z~1?vb$*=?rvIt?hcA4+I-9+KV&!H z4_Vu2DH5q}i;?OZyLe>1$wtPG*@Wv&?DKDt{-5^P|I^`i4XLWxj8!#`?l({0{-J?;U*qGQ;Ln->nKLb>6r8EWWYb=~sxh?{?n4g}e*9 z{w*b69R2W%qyM&F(Ef;j(gA$<)xX}IBs%TJM5h1&ACi12fCW{G%lB;!~FU;pR6fzw=1fmlW*!lDfYFR~M(1dXRso(wJk+apna6JH=g%!{W&FQej*Z zmp*wHO*fpp9f5-Mq;?qU>Sg#VVwPP-jv+2ToG~i}4Mj7@f>G^Yro=U3pr3^X`q?jR ziBwEBbBf7fa#1QKZ&MrYFwKvgi{1A5QVZ~ne|}^p?wHCK=V74u>Eb;o8gcrjDR$ML zE|0;8Wd#BT80}dQ_km2>7UHCBQJ*b&npuQTGm9k)@SR?Xa2gIbm#lUox)NtlSEBTQ zD4v;LDr|@4KBZUoqHkwuoEv$y^enzwdaiy3)78peh>;MzG7Ql>@1Tg+?9RtVph^4r z03>Ik%b5y16J0qiON!Dfu_(Ptr4p~3RC^2H67%Zv{p3zIjK)a^Ni2{HA%k0cLXY#6*$?Lo4(U&5^Ie=c<;&6obf=1Z4z3eahD!wD_Y zAJxD#Vt*7SDWZQi8Y*L61AaS>S=LSaZV*9{D<~+^>{Ew+jm_&SvC8|ZfgS!+byZ+3 z=^MGqT*JPR7IPC^q}lrVOQRCitU;}N)Y2A%=Cx%AlWF-joR+^H`2i2kYJa4JHtOwj ztZ-{UyVMr+YidtR!!hd{9`(fT^9{87{J-Ps_-x@#H7PQqbrWZ_Zh4EMm%**88*yRW zEoDnIyLRj2ZPZEbP$@%4?b~N^$oTc!IDY+(Y7~(*z02G~S=0O2j9s7aFA^soe%@y~ znJ)bB^RJ`nBs~2AhNnODn2!(29@gt%!sCZBpD^>*BO7J%{Ou!r{`PT~KUQt(Hs6o$ zTDr$8NpHXt=5Oo`=uy(ZZzpWcvO#acv+&rDH?=ZozH(r{09MNkSPA2>?0~j-4jV7U zw1NTljjmH0IL6~osqy>&;VvWecsL-Ki(Wx*pVbm$xp!zRHyCvcFPpUGWRHD^5ns5p$zSG&lO{B#NB**L`lX7eKk)P6)9q$a87z#N##r8|C?02)9Q-%3D! z7R4AzIP`!T+DU=$O3iok%R3f^kSYIsMc~%)-M41WW7A}gmJYf z5408+f=xS}h*kjCt<=6t0X*)}iabSdcc21;icm41R{v0B*Kom)7Xb}^yckaDQvo3* zIChHT@|A#c`N|L{%t@3e1C=OQ0!BV9Yg9mC9`%~10wM}@x1I|819a^Q75E~>nOUg- zHM3HMJA+hMTMbmLIjs;iU|GtKIzJjfwL&!E21kddHQ}lmtu)pGqjc`&Z7rZLZ)?M1 z2kwXLGN3`$N}r{l37mlb>BcOZxqwY7Vs<@q;>7`hA^0>=UDV9Q{Gcg~pWmgY`FSqOkvV${U7y>N&fSNB1g=R-O zxhE99n$oedP|(@UEuIqwbn%@1u;CpS@M%BW&7Tf{OEYb${S9=|xFO?%?ByGW!)$*# zQ5X)!BAjknI9rXf2oPM&84N@KH5iD5@)X*;FA7e`(xBuh&~)N5dZK`4^hAUHb?!!P z4A2|7hd}Kp9aN45H6ABn7|V8=VH~tr(0gHV;Pi!C9Pm4Pl7PeTEr81Zbr{+m=!-@1 z&@r1k$9}x%IgJD;Z=##}5}=@v{uh@BPJ`5ZcM`a4<}wSx?=qin17$z@Cf9r;9gl1U^xo(m30cZ%Tp826xgXw3zAac z32+CJQ}{{cCyk$DKo2Az2fyQ75AOuf9v%lluQ;o5j_tMabm&Urq$5rOO9oKsh)n2x z&kgxxvE}p0hLw9c)y`~o5_g{BCx@S0e)9Oq=jSv#qB{#<`7fNKKp{{^fg!{m!p=fC19sm32dzu+QUCw| delta 4558 zcmYjTdt8lK)c!50h|`slqI4req-N5ER5+8OYik-9XA3__MUe%m zC}{|Py^9iC@1h*8i`*7}<*@I-Gj}PsVm_Ji8)aY+Fqj#?QCa>6*IUmfkp2aRKr& z4J7Z4z%plv<`~4XR|u#AYAkz&`h$Ilt^25+7Y$aA&?wlCobo;mK$DgCY3=R8*rjtA zFr2w`YX547agVtU>oFg(>MQ&JQ(a&r3ozBIEXN!=kMts>;O$2GO~b%mHu@G7$V+^u z&l2B_I_w5b-*$9a0ko#aqX7fJkTpFXbE*tlY=#kw%`h&xi9E9)lfU+}uU#h31|stJ zXA}1KXVV%nLyn8t6zs38vDl0?7LOf#3EI8zaV=KR&gG5+%-Olz@g^EVKRe#xI#?t2 zy9YB7e^v7xdsQ>xi6{K)suS6DRf{}7#KTrutT7k)=@xga5i4x404A}*hRHH9uf^BN z%;Kx%nHB8OvME7hk?F8=iq=6yJoK!Xhn{tz8nmAA))9H&pc~ff?;`eR?)U7^+#eF) zGtUh+hVkI2PMg!-h>es^1#AI3Hd1O&VbJu>+5-+u@9eZ*339b+rlp;Sest}0c66;{ z;v8s(RgU>0R@dNo;v_gMYKD?KIP&6*BQ7K(vsofK*6MNaoLF~!RoC%~D# ztZ}KG0{z5$7d!D9PjqG)s3P8PI+OLA&N4}dZ(KQx8CT9eE;g=VoAkp0XqDPOvPx~& zSiGjp(#(}vn$5W-=Ix(42XF)2S^w0zIai@&_s?b7{qwFB!w)Lf z4c^S8!Dj?+7jt;*lRgrBtJfz4b1^G(UoRY}EIG*+@MFnIOR9Eb?5OI`995TI!QRLQ z7B6K3ieyy+b92}Iv`_`PU2#7FajYvY-fuO=?(Ol+y*(iVH&WJGzJ;}xZ@p55{NquH zqkjU|y-xfj%7m3|`$rr@?(Jl3zWzLAizr8FPYRRv>|Q5sMrH1vd{GL1U-kg0KpL=@`F)XBCm=q2^S*qs z7c73?=NsTN(*4&&Cyc(de|!}9s6~2+K3LH$Jrg~E9o~|zlmgCI&UhaIPT!Crxrq7m zCLLgTlMc4H!jFqR2>c9W0$D6BHrxF&avN-OHfw>W&&^RA0iGL@vpEC&TW`(~@s77u z4&{Y|BR3toVh6S=Jya<6w|V^G0aL&&{)ZFZVt!xOBh1$|_lfu|+l*Xhn~|q_7;)*O zql$aL?o~%;cp;WL^cR*oG=KddXy1nAD~i6U5SV`fXUZ-%<|p`w=S`0>ThrsE-=MuR zE@%bfTk!L<;Xi|K#g>NdBuTRM zxpM3CMdGwt{m!#izh6yp`D6pn|H=lQFUu5fcxYbvUUO*XG37u7Gml|OVwJ@Qm=!9H zwU)7e)4&g%DxeY$#p_!<~?R09{8VMmPv zzO~GM?4@Tt;OV3JxMFbV4ep4YW(8W8(@`lh8{NyyMz?k|PJ*3Lth*zsHqo?hs1rCf zv`%e4_z;=55M8a>plKQ=|u3!JAY_&gD+gUBgNkBY`as@_UEk- zD7W11I^g`6O3mFa?3k=C^d9gR>kGYaAU+p*d+%RKg8oF~0ehnHFv|v7jO)YYb>QY9 z&0}l8biMg9R>NxVHvfy7V%4q9x>Lb-bsnt|yWlkak=hfm=jfKrqK7rCZUO#g4XYn# zy@np(-5Q7*X8csEk*Kq$yp=uWPZYD^xA{C}Z9dPO)nsGCo&nF<*svGT_&~8EeJ@Hh zNRkOQVyjhO?o)=?H~i&zEJcX?vw?}lY1bX*qm_!M<8pQ6rM@%Fmk zIv#~r+-@c<8_{g^J_|z<3*+2EuGCA}r zy&hJj_c>MvzLnKyW@XjuCF(8NzBlp)xLfhdeRafcXnz6zWjD0Hn&AGij;OD9eg|K6 z=zC*LYr6zZ1mQBx!h z>^(m`QjrQB5O?ubBp4-Ol!?1|528;8p-+7`h+qZ_qe6V@yCJ0Z84pTd45e>40zNB2 zLVP8hfiESLgTv;zv8oi;1V?v{8Vy+i$D~A!Jk#K8v{R=^*cg7SR-F`4U;Lz+2DM?? zd~do2wTI#tqrYenkN%=bx5Q{>pccUlBR(^5IBBCD=J_qtrUwX33D71!B|wLkpgr)k zEFCgNEyzn}jUZk+OPB6PVI-^2B`&KNNmASbek(?gycfbTy{Sij*h#)MOP_qjLLRi~ z(@ESzp4g{P{2m^4yfccp&PGH8WMk;JBF+S zk)+u_hV)Rze4>^SDdR5*x3(~%zwx2v8k3Ev2mM8^Ji~~%@(g3T-VV8GoCz7@4}`os z!h~Ql)YSQs};&- zt2N!jp~~Catcka`eNQ8>jJ?r6(4}Y_YC$u~3v8Z77F?yphHm4QDs^wEioaXGlxJZI9xCdq?SoC(H7n3=-N zA|9MFo9;)Gq{d!KHEWRFyGBZTb|X8fS4upo_eb)%kI|#st^_lO_@moy^idr6?NE1u znJdgZ;CiN6~kAe8D2p9Si4R<086%&dlfSUQ7k!k=uuyk-T%7AMwsV&@5J@>kc29x`X1Opch}%60rqe@_{^D&g zo%M#3F*AfB#jB7<2&pZCqkcSu)YI^+p=Bs>L(7%quL(KcWhG5dfn3$Nl6X~P7^QY% zH2dNzf(aKUg81xMm6%Shd0qwac=C`CgSW^G%3u$ zsOot%7WI5H6=I1zXiW_5#b)r%q!=0}_E+bx7~(pA#nR+jjHH=A5tnAhk;yJ3MHs}B z30_eyw~Qw)w@jd#X^`F5CXiPTf@Q^;2rvC~UZXt^1jq1#jF z9=eqLX;KQo>=tH^Fsa0!CZ$oZIM!Jjdx_7|kkhJGjLy856F>8QAKgmAD1PI9f=MSH zzcGWFUqf0PaDe#YfP-YS8l$w|4-(AJ!ek1QB}}$3Il>$wp7#4;n(#eI(k>jKnhUwq bkdCD#X5^B?YI${kF2UpxukJre?g9S;?eq~5 diff --git a/docs/static/videos/langflow_parameters.mp4 b/docs/static/videos/langflow_parameters.mp4 index 370ca5f36819a62a1e4ce537047e9a3ee3fb51f8..c7599e6493879a53058fdd8cda85f8e1cfc807b7 100644 GIT binary patch delta 1459 zcmYMtX;2h&7zXfxh2=g(WDx|p;zl_Zl}ql+6+xCmV}TX9L=ae50m0?wFUzrjuAGWV z3hE>zxX)xZVkE|tWf)jCh6kBKDl7(>rTv>e^x^m6ndhDNxp1OUxw5BGd594(tQ26- zH*EZir5Ak76fW)|FDe!AqEfNhpBx@jq!>6nrsR@@L33q~naj_ZVLOOxB$HC1R4Fw| zozj47q^7zS@!@I0ho@B_!^e8sb5-b(Y7e`RsGHi94yB8zo2xut6Y;1XwVKkW)<8UJ zASJ{sj0LkW!$1v^$~8nPckNCsBIB=xjBj*K0{((gjtah6G5V+hW!1(Wn<2YmJmQM| z&y6pr5!Q+^wGONmla@v@P;E-Br_3mG%7U`QK(*DB21F98&JtiSL_1 zqU-AiU0?rop~R`qp9-J?sURvCPIV#S+ey)62o;K=$*@p6TzeBXJW2|#hEv;6aFrur z5XLA6jM421%S2fgLG6IDEOOKL@D@iUtwMKq)FUwwS?`3%I@-+?mx7|DRtVb{{i75X z@1lozxRb!GH%4L+cg2gu4s#JZ9MfG$7Hwj&XcHG~iOrliZy^dt<8tiDqq#Udnv2(U z!V+s2>mD@ZyUyzq8FM%FK4i=US4}+AOPEO}6M_Ux2zckOqmZ3An}*$8i6>j|hkeqe zeq5ML5*5RqlYHL`swCOvS9l)adyW$!dk=){lxcTt&q`U7fRr04D(1*~l44e)kV`1xkHUc=o#z~j8!hSkWe$(>k%M_FFIJ;u)FwUm<>>wLsm3;bA+`Upe@(2o&>4uZ!h zaEc`2=mLnN3y(5j8dtdO9W=fxW*QM&hSRsWQY* z9UebMOtVBV%_{#&PUd(OnB!G;dDAR%RfNt$ji)+UJX1+kQPo&HQ!^j>f9uC3QGvCH z3aquBDk7meawMq}84>lYJd}S{pPPu6Mq(2SqU9romQO?Q zb;5nyKs8cL;J$6P&iwCxJ6$)x=b4iHa>9Npp<2Lx+FDSI0e)L+3OvW!q<`b~=uwMA zESVf@)h4x$$587iP2ym-NSaze!sn$3pFggpf%xU)^C1ZIX)kxjn4o=T75Zx08xO(x zUHhNPa8T|TH-Ox@WBOZ6%y-Nu<1(jnF@W?pcT!#GZ|=7J9k;7{c35HkK#zMCV)ah^ z8~}FgiNJ>_-gGjc1fLF`6mYSD(aTamh*IxUC2Umdb>bs&U++jT(HrcA-r%XPy)iR? WD%}ks>pzhHMm#i6!$Y%Ap!g5*Nv}iz delta 1793 zcmXApdoM!T_m}aYof_zatoylQiOzDi$Q3l#$a+C6GDj9IZ2(cQO~J$ zPIkL)XZK`FwcEC}IxX#}Q5toSuR-xOo16#4a~tBl1nTe z;eC`UvuH~~-Pailu$I2gSgPtG&QY`K(SgqyS}h5MzfH07TLaG?xB7Sko(!|D@x{E{ zI%~?Uvymtx_EBzQ$1Jhw2OD5ZrXTD!aPYiy!4BBd&IJei2s}$d9Z3?pE`?dQ*DR+| z34E@?N$o9igF*cLL)W4L6F>aR2x##$m7A!Fu2UHULiwd*$^| zjGSreM!+M})J<2eq3dWbFHLy+83$p!Sm6iw zU^DOs0kl{VxFrm^zz2aKhyou32iahL-RIz;QN(>mwtx`w9SM~w;ragcP`ZCTjP(iQ zvCCV*HX6GezJ45YIMv(Zwc+IU?JujDo|Zc(&@#ex6=KEy5zQ8`W_rYL&G6Khh`~6x zC00;n1e+BK=CO^XdP4%z8;Wet$M}*}6kW244q(2^d`L8}0CpXX&bCFaTM(rjp z4RF70{H0zv@j-kkvwqJ*68>P0)pwN%&QtK4>_o5I=wa!$mn_|q9=jvPbSMEFT2+mRL8)kZ0SSC-HpofZoGO75dG-3}>Ye-7(EbOx> zl_!NoH&eIz!FN^m@Aw@ynAq>t4hu@s2BKm1!!%`lSK^eVpX`M@Y%)GX!m`qgcl+Ve z$&7xim(*T8lkC;A2Hg;Q=A9+K4rhPK(h^Eba?JOfZ*a`Odv!JjPwf*sjKq2+V7yX_4e;r4kI$sybeUNpuE(V9m(OTq+b547m zMJmj9PmL7Gm~%RpD&j0-aa%fXRXUN~A(68;f^oy5V`iBAY+M9N=-K#@+f9hSPm#H> zrQ?~UG@g01?L8{8E1#)XA5SI z@hfPIU->h0`QhbH>=DbKt)%=}X#?{&l#`Di!%|TB(DC>-_+?m?UJkr4Qgv_-oMu>U zVvac#ylSf8)dXPkN$)MzfLc&T_ZI6d(@=+BbybX9-;@kAP~Vh1kJ*UEi6`W^!06%+ zCz=;w{%E5)(>K|qNv?_dIlCsBvuloLE-^u2b8;SHq-Z8moa8bW;LW*{(}C~+ujMGS zX&r?vFPKBhEpMqk47Yu0`9}qARBpY^eBxb3t&i`+>!w?$6JW#8wi!NpYSg!ZQ>0Pf zZas&%tE6KabD+h&9qt+M746RFsH3LH&dn3>6Zg~nV%T8dv`_%ou)FkFaF0^gYvwYo vR_k&|gek3SH~{@K`@1N!zxyZV3wca;r@F$OtG=0igPcsGhh!ROgzWzS+QYv# diff --git a/src/frontend/src/components/AccordionComponent/index.tsx b/src/frontend/src/components/AccordionComponent/index.tsx index e19bd3d29..06ecc36b0 100644 --- a/src/frontend/src/components/AccordionComponent/index.tsx +++ b/src/frontend/src/components/AccordionComponent/index.tsx @@ -33,10 +33,10 @@ export default function AccordionComponent({ } const handleKeyDown = (event) => { - if (event.key === "Backspace") { + /* if (event.key === "Backspace") { event.preventDefault(); event.stopPropagation(); - } + } */ }; return ( diff --git a/src/frontend/src/components/codeTabsComponent/index.tsx b/src/frontend/src/components/codeTabsComponent/index.tsx index 2f3e79a68..25fe48a8f 100644 --- a/src/frontend/src/components/codeTabsComponent/index.tsx +++ b/src/frontend/src/components/codeTabsComponent/index.tsx @@ -159,13 +159,13 @@ export default function CodeTabsComponent({ )} - {tabs.map((tab, index) => ( + {tabs.map((tab, idx) => ( - {index < 4 ? ( + {idx < 4 ? ( <> {tab.description && (
- ) : index === 4 ? ( + ) : idx === 4 ? ( <>
- {data?.map((node: any, index) => ( -
+ {data?.map((node: any, i) => ( +
{tweaks?.tweaksList!.current.includes( node["data"]["id"] ) && ( @@ -236,10 +236,10 @@ export default function CodeTabsComponent({ node.data.node.template[templateField] .type === "int") ) - .map((templateField, index) => { + .map((templateField, indx) => { return ( @@ -277,13 +277,7 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList!.find( - (obj) => - obj.data.node - .template[ - templateField - ] - )!.data.node.template[ + newInputList![i].data.node.template[ templateField ].value = target; return newInputList; @@ -330,13 +324,7 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList!.find( - (obj) => - obj.data.node - .template[ - templateField - ] - )!.data.node.template[ + newInputList![i].data.node.template[ templateField ].value = target; return newInputList; @@ -379,13 +367,7 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList!.find( - (obj) => - obj.data.node - .template[ - templateField - ] - )!.data.node.template[ + newInputList![i].data.node.template[ templateField ].value = target; return newInputList; @@ -416,13 +398,7 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList!.find( - (obj) => - obj.data.node - .template[ - templateField - ] - )!.data.node.template[ + newInputList![i].data.node.template[ templateField ].value = e; return newInputList; @@ -511,13 +487,7 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList!.find( - (obj) => - obj.data.node - .template[ - templateField - ] - )!.data.node.template[ + newInputList![i].data.node.template[ templateField ].value = target; return newInputList; @@ -551,13 +521,7 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList!.find( - (obj) => - obj.data.node - .template[ - templateField - ] - )!.data.node.template[ + newInputList![i].data.node.template[ templateField ].value = target; return newInputList; @@ -607,14 +571,7 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - - newInputList!.find( - (obj) => - obj.data.node - .template[ - templateField - ] - )!.data.node.template[ + newInputList![i].data.node.template[ templateField ].value = target; return newInputList; @@ -667,13 +624,7 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList!.find( - (obj) => - obj.data.node - .template[ - templateField - ] - )!.data.node.template[ + newInputList![i].data.node.template[ templateField ].value = target; return newInputList; @@ -726,13 +677,7 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList!.find( - (obj) => - obj.data.node - .template[ - templateField - ] - )!.data.node.template[ + newInputList![i].data.node.template[ templateField ].value = target; return newInputList; From 9029beec648073c75f7a590f9c0c1c4122ce19dc Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Wed, 23 Aug 2023 17:52:32 -0300 Subject: [PATCH 065/134] Fix: git bug --- .gitattributes | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index b69d73e97..83c12c72a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,4 +17,7 @@ # Denote all files that are truly binary and should not be modified. *.png binary -*.jpg binary \ No newline at end of file +*.jpg binary +*.mp4 binary +*.ico binary +*.svg binary \ No newline at end of file From 56a75af6dad1fb964ba9478ff14eba1ec79f56f2 Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Wed, 23 Aug 2023 18:02:50 -0300 Subject: [PATCH 066/134] Remove console.log --- src/frontend/src/utils/reactflowUtils.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts index 13c3973f1..1d74d14fe 100644 --- a/src/frontend/src/utils/reactflowUtils.ts +++ b/src/frontend/src/utils/reactflowUtils.ts @@ -247,7 +247,6 @@ export function handleKeyDown( inputValue: string | string[] | null, block: string ) { - console.log(e, inputValue, block); //condition to fix bug control+backspace on Windows/Linux if ( (typeof inputValue === "string" && From 13a60c872f01e34664c13a6e1a9b2155c12d78df Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Wed, 23 Aug 2023 19:26:25 -0300 Subject: [PATCH 067/134] Fix: Node deleted when press backspace on tweaks page --- .../src/components/codeTabsComponent/index.tsx | 12 ++++++++++++ src/frontend/src/types/utils/reactflowUtils.ts | 7 ++++++- src/frontend/src/utils/reactflowUtils.ts | 14 +++++++++++++- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/components/codeTabsComponent/index.tsx b/src/frontend/src/components/codeTabsComponent/index.tsx index 25fe48a8f..cdb2ec0ed 100644 --- a/src/frontend/src/components/codeTabsComponent/index.tsx +++ b/src/frontend/src/components/codeTabsComponent/index.tsx @@ -32,6 +32,8 @@ import { darkContext } from "../../contexts/darkContext"; import { codeTabsPropsType } from "../../types/components"; import { classNames } from "../../utils/utils"; import IconComponent from "../genericIconComponent"; +import { unselectAllNodes } from "../../utils/reactflowUtils"; +import { typesContext } from "../../contexts/typesContext"; export default function CodeTabsComponent({ flow, @@ -45,12 +47,22 @@ export default function CodeTabsComponent({ const [data, setData] = useState(flow ? flow["data"]!["nodes"] : null); const [openAccordion, setOpenAccordion] = useState([]); const { dark } = useContext(darkContext); + const { reactFlowInstance } = useContext(typesContext); useEffect(() => { if (flow && flow["data"]!["nodes"]) { setData(flow["data"]!["nodes"]); } }, [flow]); + + useEffect(() => { + unselectAllNodes({ + data, + updateNodes: (nodes) => { + reactFlowInstance?.setNodes(nodes); + } + }); + }, []) const copyToClipboard = () => { if (!navigator.clipboard || !navigator.clipboard.writeText) { diff --git a/src/frontend/src/types/utils/reactflowUtils.ts b/src/frontend/src/types/utils/reactflowUtils.ts index ecbbda4e4..6ec40512d 100644 --- a/src/frontend/src/types/utils/reactflowUtils.ts +++ b/src/frontend/src/types/utils/reactflowUtils.ts @@ -1,4 +1,4 @@ -import { Edge } from "reactflow"; +import { Edge, Node } from "reactflow"; import { NodeType } from "../flow"; export type cleanEdgesType = { @@ -8,3 +8,8 @@ export type cleanEdgesType = { }; updateEdge: (edge: Edge[]) => void; }; + +export type unselectAllNodesType = { + updateNodes: (nodes: Node[]) => void, + data: Node[] | null +}; diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts index 1d74d14fe..999f45ecb 100644 --- a/src/frontend/src/utils/reactflowUtils.ts +++ b/src/frontend/src/utils/reactflowUtils.ts @@ -2,14 +2,18 @@ import _ from "lodash"; import { Connection, Edge, + Node, ReactFlowInstance, ReactFlowJsonObject, + useNodesState, } from "reactflow"; import { specialCharsRegex } from "../constants/constants"; import { APITemplateType } from "../types/api"; import { FlowType, NodeType } from "../types/flow"; -import { cleanEdgesType } from "../types/utils/reactflowUtils"; +import { cleanEdgesType, unselectAllNodesType } from "../types/utils/reactflowUtils"; import { toNormalCase } from "./utils"; +import { useContext } from "react"; +import { typesContext } from "../contexts/typesContext"; export function cleanEdges({ flow: { edges, nodes }, @@ -55,6 +59,14 @@ export function cleanEdges({ updateEdge(newEdges); } +export function unselectAllNodes({ updateNodes, data }: unselectAllNodesType) { + let newNodes = _.cloneDeep(data); + newNodes!.forEach((node: Node) => { + node.selected = false; + }); + updateNodes(newNodes!); +} + export function isValidConnection( { source, target, sourceHandle, targetHandle }: Connection, reactFlowInstance: ReactFlowInstance From 1d166b6e6b5ca999c3184014e0676b4f0c774e6a Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Wed, 23 Aug 2023 20:10:54 -0300 Subject: [PATCH 068/134] poetry lock --- poetry.lock | 91 +++++++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 41 deletions(-) diff --git a/poetry.lock b/poetry.lock index 186eb4128..0a734e2da 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1889,18 +1889,18 @@ grpc = ["grpcio (>=1.44.0,<2.0.0.dev0)"] [[package]] name = "gotrue" -version = "1.0.2" +version = "1.0.4" description = "Python Client Library for GoTrue" optional = false python-versions = ">=3.8,<4.0" files = [ - {file = "gotrue-1.0.2-py3-none-any.whl", hash = "sha256:5377e7fd316b77df7be9e0c3c017d338bed2ba2e95a99fb44374b523d167ec65"}, - {file = "gotrue-1.0.2.tar.gz", hash = "sha256:9ad9b2536ca68676cf37dc663b64f259956826075e80a9cb3f5a3ba150355811"}, + {file = "gotrue-1.0.4-py3-none-any.whl", hash = "sha256:f016f5e317a21e55dfcee00fb360f2c7a33c5b87a38601e7b9e65cb898bcf7bb"}, + {file = "gotrue-1.0.4.tar.gz", hash = "sha256:2686c93b798fb2d3b120f067d21e66bb803b013ee6ab6fb7783093102f74603a"}, ] [package.dependencies] httpx = ">=0.23,<0.25" -pydantic = ">=1.10.0,<2.0.0" +pydantic = ">=1.10,<3" [[package]] name = "greenlet" @@ -3308,13 +3308,13 @@ files = [ [[package]] name = "metaphor-python" -version = "0.1.15" +version = "0.1.16" description = "A Python package for the Metaphor API." optional = false python-versions = "*" files = [ - {file = "metaphor-python-0.1.15.tar.gz", hash = "sha256:66e324377af7df4799b845fe8de4f81393db48baa76db59308f7eebec2ba9421"}, - {file = "metaphor_python-0.1.15-py3-none-any.whl", hash = "sha256:e9efe6ccd175d67b08331955c0290ff1fe83bb4c43e80a88a154e254bf47aaf4"}, + {file = "metaphor-python-0.1.16.tar.gz", hash = "sha256:c26c3e8a37ef1b195073d556c929180c2b1acf7590a801da8d1b9afbdd82dd8f"}, + {file = "metaphor_python-0.1.16-py3-none-any.whl", hash = "sha256:f3989a679f888cc0374593ab5e5a82b0f121c90b14d6eb5b813e861990dbb13b"}, ] [package.dependencies] @@ -5792,53 +5792,62 @@ files = [ [[package]] name = "safetensors" -version = "0.3.2" +version = "0.3.3" description = "Fast and Safe Tensor serialization" optional = true python-versions = "*" files = [ - {file = "safetensors-0.3.2-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:b6a66989075c2891d743153e8ba9ca84ee7232c8539704488f454199b8b8f84d"}, - {file = "safetensors-0.3.2-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:670d6bc3a3b377278ce2971fa7c36ebc0a35041c4ea23b9df750a39380800195"}, - {file = "safetensors-0.3.2-cp310-cp310-macosx_13_0_x86_64.whl", hash = "sha256:7f80af7e4ab3188daaff12d43d078da3017a90d732d38d7af4eb08b6ca2198a5"}, - {file = "safetensors-0.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cbb44e140bf2aeda98d9dde669dbec15f7b77f96a9274469b91a6cf4bcc5ec3b"}, - {file = "safetensors-0.3.2-cp310-cp310-win32.whl", hash = "sha256:2961c1243fd0da46aa6a1c835305cc4595486f8ac64632a604d0eb5f2de76175"}, - {file = "safetensors-0.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:c813920482c337d1424d306e1b05824a38e3ef94303748a0a287dea7a8c4f805"}, - {file = "safetensors-0.3.2-cp311-cp311-macosx_10_11_universal2.whl", hash = "sha256:707df34bd9b9047e97332136ad98e57028faeccdb9cfe1c3b52aba5964cc24bf"}, - {file = "safetensors-0.3.2-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:becc5bb85b2947eae20ed23b407ebfd5277d9a560f90381fe2c42e6c043677ba"}, - {file = "safetensors-0.3.2-cp311-cp311-macosx_13_0_universal2.whl", hash = "sha256:54ad6af663e15e2b99e2ea3280981b7514485df72ba6d014dc22dae7ba6a5e6c"}, - {file = "safetensors-0.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ada0fac127ff8fb04834da5c6d85a8077e6a1c9180a11251d96f8068db922a17"}, - {file = "safetensors-0.3.2-cp311-cp311-win32.whl", hash = "sha256:155b82dbe2b0ebff18cde3f76b42b6d9470296e92561ef1a282004d449fa2b4c"}, - {file = "safetensors-0.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:a86428d196959619ce90197731be9391b5098b35100a7228ef4643957648f7f5"}, - {file = "safetensors-0.3.2-cp37-cp37m-macosx_11_0_x86_64.whl", hash = "sha256:c1f8ab41ed735c5b581f451fd15d9602ff51aa88044bfa933c5fa4b1d0c644d1"}, - {file = "safetensors-0.3.2-cp37-cp37m-macosx_13_0_x86_64.whl", hash = "sha256:bc9cfb3c9ea2aec89685b4d656f9f2296f0f0d67ecf2bebf950870e3be89b3db"}, - {file = "safetensors-0.3.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d7d70d48585fe8df00725aa788f2e64fd24a4c9ae07cd6be34f6859d0f89a9c"}, - {file = "safetensors-0.3.2-cp37-cp37m-win32.whl", hash = "sha256:6ff59bc90cdc857f68b1023be9085fda6202bbe7f2fd67d06af8f976d6adcc10"}, - {file = "safetensors-0.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:8b05c93da15fa911763a89281906ca333ed800ab0ef1c7ce53317aa1a2322f19"}, - {file = "safetensors-0.3.2-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:8969cfd9e8d904e8d3c67c989e1bd9a95e3cc8980d4f95e4dcd43c299bb94253"}, - {file = "safetensors-0.3.2-cp38-cp38-macosx_13_0_x86_64.whl", hash = "sha256:f54148ac027556eb02187e9bc1556c4d916c99ca3cb34ca36a7d304d675035c1"}, - {file = "safetensors-0.3.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa98f49e95f02eb750d32c4947e7d5aa43883149ebd0414920866446525b70f0"}, - {file = "safetensors-0.3.2-cp38-cp38-win32.whl", hash = "sha256:33409df5e28a83dc5cc5547a3ac17c0f1b13a1847b1eb3bc4b3be0df9915171e"}, - {file = "safetensors-0.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:e04a7cbbb3856159ab99e3adb14521544f65fcb8548cce773a1435a0f8d78d27"}, - {file = "safetensors-0.3.2-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:7c864cf5dcbfb608c5378f83319c60cc9c97263343b57c02756b7613cd5ab4dd"}, - {file = "safetensors-0.3.2-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:14e8c19d6dc51d4f70ee33c46aff04c8ba3f95812e74daf8036c24bc86e75cae"}, - {file = "safetensors-0.3.2-cp39-cp39-macosx_13_0_x86_64.whl", hash = "sha256:fafd95e5ef41e8f312e2a32b7031f7b9b2a621b255f867b221f94bb2e9f51ae8"}, - {file = "safetensors-0.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87ff0024ef2e5722a79af24688ce4a430f70601d0cf712a744105ed4b8f67ba5"}, - {file = "safetensors-0.3.2-cp39-cp39-win32.whl", hash = "sha256:827af9478b78977248ba93e2fd97ea307fb63f463f80cef4824460f8c2542a52"}, - {file = "safetensors-0.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:9b09f27c456efa301f98681ea14b12f81f2637889f6336223ccab71e42c34541"}, - {file = "safetensors-0.3.2.tar.gz", hash = "sha256:2dbd34554ed3b99435a0e84df077108f5334c8336b5ed9cb8b6b98f7b10da2f6"}, + {file = "safetensors-0.3.3-cp310-cp310-macosx_10_11_x86_64.whl", hash = "sha256:92e4d0c8b2836120fddd134474c5bda8963f322333941f8b9f643e5b24f041eb"}, + {file = "safetensors-0.3.3-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:3dcadb6153c42addc9c625a622ebde9293fabe1973f9ef31ba10fb42c16e8536"}, + {file = "safetensors-0.3.3-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:08f26b61e1b0a14dc959aa9d568776bd038805f611caef1de04a80c468d4a7a4"}, + {file = "safetensors-0.3.3-cp310-cp310-macosx_12_0_x86_64.whl", hash = "sha256:17f41344d9a075f2f21b289a49a62e98baff54b5754240ba896063bce31626bf"}, + {file = "safetensors-0.3.3-cp310-cp310-macosx_13_0_arm64.whl", hash = "sha256:f1045f798e1a16a6ced98d6a42ec72936d367a2eec81dc5fade6ed54638cd7d2"}, + {file = "safetensors-0.3.3-cp310-cp310-macosx_13_0_x86_64.whl", hash = "sha256:eaf0e4bc91da13f21ac846a39429eb3f3b7ed06295a32321fa3eb1a59b5c70f3"}, + {file = "safetensors-0.3.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a07121f427e646a50d18c1be0fa1a2cbf6398624c31149cd7e6b35486d72189e"}, + {file = "safetensors-0.3.3-cp310-cp310-win32.whl", hash = "sha256:a85e29cbfddfea86453cc0f4889b4bcc6b9c155be9a60e27be479a34e199e7ef"}, + {file = "safetensors-0.3.3-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:cbc3312f134baf07334dd517341a4b470b2931f090bd9284888acb7dfaf4606f"}, + {file = "safetensors-0.3.3-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:d15030af39d5d30c22bcbc6d180c65405b7ea4c05b7bab14a570eac7d7d43722"}, + {file = "safetensors-0.3.3-cp311-cp311-macosx_12_0_universal2.whl", hash = "sha256:f84a74cbe9859b28e3d6d7715ac1dd3097bebf8d772694098f6d42435245860c"}, + {file = "safetensors-0.3.3-cp311-cp311-macosx_13_0_arm64.whl", hash = "sha256:10d637423d98ab2e6a4ad96abf4534eb26fcaf8ca3115623e64c00759374e90d"}, + {file = "safetensors-0.3.3-cp311-cp311-macosx_13_0_universal2.whl", hash = "sha256:3b46f5de8b44084aff2e480874c550c399c730c84b2e8ad1bddb062c94aa14e9"}, + {file = "safetensors-0.3.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e8fdf7407dba44587ed5e79d5de3533d242648e1f2041760b21474bd5ea5c8c"}, + {file = "safetensors-0.3.3-cp311-cp311-win32.whl", hash = "sha256:7d3b744cee8d7a46ffa68db1a2ff1a1a432488e3f7a5a97856fe69e22139d50c"}, + {file = "safetensors-0.3.3-cp37-cp37m-macosx_10_11_x86_64.whl", hash = "sha256:2fff5b19a1b462c17322998b2f4b8bce43c16fe208968174d2f3a1446284ceed"}, + {file = "safetensors-0.3.3-cp37-cp37m-macosx_11_0_x86_64.whl", hash = "sha256:41adb1d39e8aad04b16879e3e0cbcb849315999fad73bc992091a01e379cb058"}, + {file = "safetensors-0.3.3-cp37-cp37m-macosx_12_0_x86_64.whl", hash = "sha256:0f2b404250b3b877b11d34afcc30d80e7035714a1116a3df56acaca6b6c00096"}, + {file = "safetensors-0.3.3-cp37-cp37m-macosx_13_0_x86_64.whl", hash = "sha256:b43956ef20e9f4f2e648818a9e7b3499edd6b753a0f5526d4f6a6826fbee8446"}, + {file = "safetensors-0.3.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c32ee08f61cea56a5d62bbf94af95df6040c8ab574afffaeb7b44ae5da1e9e3"}, + {file = "safetensors-0.3.3-cp37-cp37m-win32.whl", hash = "sha256:351600f367badd59f7bfe86d317bb768dd8c59c1561c6fac43cafbd9c1af7827"}, + {file = "safetensors-0.3.3-cp38-cp38-macosx_10_11_x86_64.whl", hash = "sha256:8530399666748634bc0b301a6a5523756931b0c2680d188e743d16304afe917a"}, + {file = "safetensors-0.3.3-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:9d741c1f1621e489ba10aa3d135b54202684f6e205df52e219d5eecd673a80c9"}, + {file = "safetensors-0.3.3-cp38-cp38-macosx_12_0_arm64.whl", hash = "sha256:0c345fd85b4d2093a5109596ff4cd9dfc2e84992e881b4857fbc4a93a3b89ddb"}, + {file = "safetensors-0.3.3-cp38-cp38-macosx_12_0_x86_64.whl", hash = "sha256:69ccee8d05f55cdf76f7e6c87d2bdfb648c16778ef8acfd2ecc495e273e9233e"}, + {file = "safetensors-0.3.3-cp38-cp38-macosx_13_0_arm64.whl", hash = "sha256:c08a9a4b7a4ca389232fa8d097aebc20bbd4f61e477abc7065b5c18b8202dede"}, + {file = "safetensors-0.3.3-cp38-cp38-macosx_13_0_x86_64.whl", hash = "sha256:a002868d2e3f49bbe81bee2655a411c24fa1f8e68b703dec6629cb989d6ae42e"}, + {file = "safetensors-0.3.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ab43aeeb9eadbb6b460df3568a662e6f1911ecc39387f8752afcb6a7d96c087"}, + {file = "safetensors-0.3.3-cp38-cp38-win32.whl", hash = "sha256:f2f59fce31dd3429daca7269a6b06f65e6547a0c248f5116976c3f1e9b73f251"}, + {file = "safetensors-0.3.3-cp39-cp39-macosx_10_11_x86_64.whl", hash = "sha256:59a596b3225c96d59af412385981f17dd95314e3fffdf359c7e3f5bb97730a19"}, + {file = "safetensors-0.3.3-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:82a16e92210a6221edd75ab17acdd468dd958ef5023d9c6c1289606cc30d1479"}, + {file = "safetensors-0.3.3-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:98a929e763a581f516373ef31983ed1257d2d0da912a8e05d5cd12e9e441c93a"}, + {file = "safetensors-0.3.3-cp39-cp39-macosx_12_0_x86_64.whl", hash = "sha256:12b83f1986cd16ea0454c636c37b11e819d60dd952c26978310a0835133480b7"}, + {file = "safetensors-0.3.3-cp39-cp39-macosx_13_0_arm64.whl", hash = "sha256:f439175c827c2f1bbd54df42789c5204a10983a30bc4242bc7deaf854a24f3f0"}, + {file = "safetensors-0.3.3-cp39-cp39-macosx_13_0_x86_64.whl", hash = "sha256:0085be33b8cbcb13079b3a8e131656e05b0bc5e6970530d4c24150f7afd76d70"}, + {file = "safetensors-0.3.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad3cc8006e7a86ee7c88bd2813ec59cd7cc75b03e6fa4af89b9c7b235b438d68"}, + {file = "safetensors-0.3.3-cp39-cp39-win32.whl", hash = "sha256:ab29f54c6b8c301ca05fa014728996bd83aac6e21528f893aaf8945c71f42b6d"}, + {file = "safetensors-0.3.3.tar.gz", hash = "sha256:edb7072d788c4f929d0f5735d3a2fb51e5a27f833587828583b7f5747af1a2b8"}, ] [package.extras] all = ["black (==22.3)", "click (==8.0.4)", "flake8 (>=3.8.3)", "flax (>=0.6.3)", "h5py (>=3.7.0)", "huggingface-hub (>=0.12.1)", "isort (>=5.5.4)", "jax (>=0.3.25)", "jaxlib (>=0.3.25)", "numpy (>=1.21.6)", "paddlepaddle (>=2.4.1)", "pytest (>=7.2.0)", "pytest-benchmark (>=4.0.0)", "setuptools-rust (>=1.5.2)", "tensorflow (==2.11.0)", "torch (>=1.10)"] dev = ["black (==22.3)", "click (==8.0.4)", "flake8 (>=3.8.3)", "flax (>=0.6.3)", "h5py (>=3.7.0)", "huggingface-hub (>=0.12.1)", "isort (>=5.5.4)", "jax (>=0.3.25)", "jaxlib (>=0.3.25)", "numpy (>=1.21.6)", "paddlepaddle (>=2.4.1)", "pytest (>=7.2.0)", "pytest-benchmark (>=4.0.0)", "setuptools-rust (>=1.5.2)", "tensorflow (==2.11.0)", "torch (>=1.10)"] -jax = ["flax (>=0.6.3)", "jax (>=0.3.25)", "jaxlib (>=0.3.25)"] +jax = ["flax (>=0.6.3)", "jax (>=0.3.25)", "jaxlib (>=0.3.25)", "numpy (>=1.21.6)"] numpy = ["numpy (>=1.21.6)"] -paddlepaddle = ["paddlepaddle (>=2.4.1)"] +paddlepaddle = ["numpy (>=1.21.6)", "paddlepaddle (>=2.4.1)"] pinned-tf = ["tensorflow (==2.11.0)"] quality = ["black (==22.3)", "click (==8.0.4)", "flake8 (>=3.8.3)", "isort (>=5.5.4)"] -tensorflow = ["tensorflow (>=2.11.0)"] +tensorflow = ["numpy (>=1.21.6)", "tensorflow (>=2.11.0)"] testing = ["h5py (>=3.7.0)", "huggingface-hub (>=0.12.1)", "numpy (>=1.21.6)", "pytest (>=7.2.0)", "pytest-benchmark (>=4.0.0)", "setuptools-rust (>=1.5.2)"] -torch = ["torch (>=1.10)"] +torch = ["numpy (>=1.21.6)", "torch (>=1.10)"] [[package]] name = "scikit-learn" From 8fb73e689ab52eac43ba022755a77023afe63bb9 Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Wed, 23 Aug 2023 20:23:18 -0300 Subject: [PATCH 069/134] Fix: Code is ready to run success alert showing up in tweaks page --- src/frontend/src/components/AccordionComponent/index.tsx | 8 -------- src/frontend/src/components/codeTabsComponent/index.tsx | 6 ++++++ src/frontend/src/contexts/alertContext.tsx | 5 +++++ src/frontend/src/modals/codeAreaModal/index.tsx | 4 ++-- .../FlowPage/components/extraSidebarComponent/index.tsx | 7 +++++-- src/frontend/src/types/typesContext/index.ts | 2 ++ src/frontend/src/utils/reactflowUtils.ts | 3 --- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/frontend/src/components/AccordionComponent/index.tsx b/src/frontend/src/components/AccordionComponent/index.tsx index 06ecc36b0..e00932c76 100644 --- a/src/frontend/src/components/AccordionComponent/index.tsx +++ b/src/frontend/src/components/AccordionComponent/index.tsx @@ -32,13 +32,6 @@ export default function AccordionComponent({ value === "" ? setValue(keyValue!) : setValue(""); } - const handleKeyDown = (event) => { - /* if (event.key === "Backspace") { - event.preventDefault(); - event.stopPropagation(); - } */ - }; - return ( <> ([]); const { dark } = useContext(darkContext); const { reactFlowInstance } = useContext(typesContext); + const { isTweakPage, setIsTweakPage } = useContext(alertContext); useEffect(() => { if (flow && flow["data"]!["nodes"]) { @@ -62,6 +64,10 @@ export default function CodeTabsComponent({ reactFlowInstance?.setNodes(nodes); } }); + + return () => { + if (isTweakPage) setIsTweakPage(false); + }; }, []) const copyToClipboard = () => { diff --git a/src/frontend/src/contexts/alertContext.tsx b/src/frontend/src/contexts/alertContext.tsx index 1741b88b6..46a0d8a3b 100644 --- a/src/frontend/src/contexts/alertContext.tsx +++ b/src/frontend/src/contexts/alertContext.tsx @@ -26,6 +26,8 @@ const initialValue: alertContextType = { pushNotificationList: () => {}, clearNotificationList: () => {}, removeFromNotificationList: () => {}, + isTweakPage: false, + setIsTweakPage: () => {}, }; export const alertContext = createContext(initialValue); @@ -48,6 +50,7 @@ export function AlertProvider({ children }: { children: ReactNode }) { const [successOpen, setSuccessOpen] = useState(false); const [notificationCenter, setNotificationCenter] = useState(false); const [notificationList, setNotificationList] = useState([]); + const [isTweakPage, setIsTweakPage] = useState(false); const pushNotificationList = (notification: AlertItemType) => { setNotificationList((old) => { let newNotificationList = _.cloneDeep(old); @@ -120,6 +123,8 @@ export function AlertProvider({ children }: { children: ReactNode }) { return ( (null); - const { setErrorData, setSuccessData } = useContext(alertContext); + const { setErrorData, setSuccessData, isTweakPage } = useContext(alertContext); const [error, setError] = useState<{ detail: { error: string | undefined; traceback: string | undefined }; } | null>(null); @@ -39,7 +39,7 @@ export default function CodeAreaModal({ if (dynamic && Object.keys(nodeClass!.template).length > 2) { return; } - processCode(); + if (!isTweakPage) processCode(); }, []); function processNonDynamicField() { diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx index f8ac36230..f1a84bce9 100644 --- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx @@ -21,7 +21,7 @@ export default function ExtraSidebar(): JSX.Element { const { data, templates } = useContext(typesContext); const { flows, tabId, uploadFlow, tabsState, saveFlow, isBuilt } = useContext(TabsContext); - const { setSuccessData, setErrorData } = useContext(alertContext); + const { setSuccessData, setErrorData, setIsTweakPage } = useContext(alertContext); const [dataFilter, setFilterData] = useState(data); const [search, setSearch] = useState(""); const isPending = tabsState[tabId]?.isPending; @@ -100,7 +100,10 @@ export default function ExtraSidebar(): JSX.Element {
{flow && flow.data && ( -
+
setIsTweakPage(true)} + > void; loading: boolean; setLoading: (newState: boolean) => void; + isTweakPage: boolean; + setIsTweakPage: (newState: boolean) => void; }; export type darkContextType = { diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts index 999f45ecb..6a12f3edd 100644 --- a/src/frontend/src/utils/reactflowUtils.ts +++ b/src/frontend/src/utils/reactflowUtils.ts @@ -5,15 +5,12 @@ import { Node, ReactFlowInstance, ReactFlowJsonObject, - useNodesState, } from "reactflow"; import { specialCharsRegex } from "../constants/constants"; import { APITemplateType } from "../types/api"; import { FlowType, NodeType } from "../types/flow"; import { cleanEdgesType, unselectAllNodesType } from "../types/utils/reactflowUtils"; import { toNormalCase } from "./utils"; -import { useContext } from "react"; -import { typesContext } from "../contexts/typesContext"; export function cleanEdges({ flow: { edges, nodes }, From 9686542f0a6105709cb299844e284ce73a3e5379 Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Wed, 23 Aug 2023 20:38:40 -0300 Subject: [PATCH 070/134] Fix: code is ready to run does not appear after build --- .../src/components/chatComponent/buildTrigger/index.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/frontend/src/components/chatComponent/buildTrigger/index.tsx b/src/frontend/src/components/chatComponent/buildTrigger/index.tsx index 0967952b5..9eb25bb37 100644 --- a/src/frontend/src/components/chatComponent/buildTrigger/index.tsx +++ b/src/frontend/src/components/chatComponent/buildTrigger/index.tsx @@ -60,6 +60,11 @@ export default function BuildTrigger({ ], }); } + if (errors.length === 0 && allNodesValid) { + setSuccessData({ + title: "Code is ready to run", + }); + } } catch (error) { console.error("Error:", error); } finally { From cd6985591f7b352b29da624727494815348e775c Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Wed, 23 Aug 2023 21:09:53 -0300 Subject: [PATCH 071/134] fix(App.tsx): replace hardcoded error message with FetchErrorComponent to improve error handling and display feat(App.tsx): add support for displaying fetch error message and description in FetchErrorComponent feat(fetchErrorComponent): create FetchErrorComponent to display fetch error message and description fix(genericIconComponent): add stroke-width property to ensure consistent icon stroke width feat(loadingComponent): import LoadingComponentProps from types/components to improve type safety feat(constants): add FETCH_ERROR_MESSAGE and FETCH_ERROR_DESCRIPTION constants for fetch error handling fix(typesContext): remove console.log statement and set fetchError to true when an error occurs during fetching types feat(typesContext): add error handling for fetching types and set fetchError to true when an error occurs feat(typesContext): import fetchErrorComponentType from types/components to improve type safety feat(types/components): create fetchErrorComponentType and LoadingComponentProps interfaces for type safety fix(styleUtils): import Unplug icon from lucide-react to fix missing icon issue --- src/frontend/src/App.tsx | 10 +++++++++- .../src/components/fetchErrorComponent/index.tsx | 16 ++++++++++++++++ .../components/genericIconComponent/index.tsx | 8 +++++++- .../src/components/loadingComponent/index.tsx | 4 +--- src/frontend/src/constants/constants.ts | 4 ++++ src/frontend/src/contexts/typesContext.tsx | 1 - src/frontend/src/types/components/index.ts | 8 ++++++++ src/frontend/src/utils/styleUtils.ts | 2 ++ 8 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 src/frontend/src/components/fetchErrorComponent/index.tsx diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx index 5bda7ff37..2109222ed 100644 --- a/src/frontend/src/App.tsx +++ b/src/frontend/src/App.tsx @@ -9,7 +9,12 @@ import ErrorAlert from "./alerts/error"; import NoticeAlert from "./alerts/notice"; import SuccessAlert from "./alerts/success"; import CrashErrorComponent from "./components/CrashErrorComponent"; +import FetchErrorComponent from "./components/fetchErrorComponent"; import LoadingComponent from "./components/loadingComponent"; +import { + FETCH_ERROR_DESCRIPION, + FETCH_ERROR_MESSAGE, +} from "./constants/constants"; import { alertContext } from "./contexts/alertContext"; import { locationContext } from "./contexts/locationContext"; import { TabsContext } from "./contexts/tabsContext"; @@ -140,7 +145,10 @@ export default function App() { {loading ? (
{fetchError ? ( -
There was an error on the backend
+ ) : ( )} diff --git a/src/frontend/src/components/fetchErrorComponent/index.tsx b/src/frontend/src/components/fetchErrorComponent/index.tsx new file mode 100644 index 000000000..6004d9dfc --- /dev/null +++ b/src/frontend/src/components/fetchErrorComponent/index.tsx @@ -0,0 +1,16 @@ +import { fetchErrorComponentType } from "../../types/components"; +import IconComponent from "../genericIconComponent"; + +export default function FetchErrorComponent({ + message, + description, +}: fetchErrorComponentType) { + return ( +
+ +

+ {message} + {description} +
+ ); +} diff --git a/src/frontend/src/components/genericIconComponent/index.tsx b/src/frontend/src/components/genericIconComponent/index.tsx index 32647f159..a06707d74 100644 --- a/src/frontend/src/components/genericIconComponent/index.tsx +++ b/src/frontend/src/components/genericIconComponent/index.tsx @@ -7,5 +7,11 @@ export default function IconComponent({ iconColor, }: IconComponentProps): JSX.Element { const TargetIcon = nodeIconsLucide[name] ?? nodeIconsLucide["unknown"]; - return ; + return ( + + ); } diff --git a/src/frontend/src/components/loadingComponent/index.tsx b/src/frontend/src/components/loadingComponent/index.tsx index 31e78d474..a1e406710 100644 --- a/src/frontend/src/components/loadingComponent/index.tsx +++ b/src/frontend/src/components/loadingComponent/index.tsx @@ -1,6 +1,4 @@ -type LoadingComponentProps = { - remSize: number; -}; +import { LoadingComponentProps } from "../../types/components"; export default function LoadingComponent({ remSize }: LoadingComponentProps) { return ( diff --git a/src/frontend/src/constants/constants.ts b/src/frontend/src/constants/constants.ts index 3f698c64e..aa9f1555a 100644 --- a/src/frontend/src/constants/constants.ts +++ b/src/frontend/src/constants/constants.ts @@ -511,3 +511,7 @@ export const URL_EXCLUDED_FROM_ERROR_RETRIES = [ ]; export const skipNodeUpdate = ["CustomComponent"]; + +export const FETCH_ERROR_MESSAGE = "Couldn't establish a connection."; +export const FETCH_ERROR_DESCRIPION = + "Check if everything is working properly and try again."; diff --git a/src/frontend/src/contexts/typesContext.tsx b/src/frontend/src/contexts/typesContext.tsx index 189f61af0..05346838d 100644 --- a/src/frontend/src/contexts/typesContext.tsx +++ b/src/frontend/src/contexts/typesContext.tsx @@ -78,7 +78,6 @@ export function TypesProvider({ children }: { children: ReactNode }) { } catch (error) { console.error("An error has occurred while fetching types."); await getHealth().catch((e) => { - console.log("entrou"); setFetchError(true); }); } diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts index 5cf87b8d3..0ebe768c1 100644 --- a/src/frontend/src/types/components/index.ts +++ b/src/frontend/src/types/components/index.ts @@ -171,3 +171,11 @@ export type IconComponentProps = { export interface languageMap { [key: string]: string | undefined; } +export type fetchErrorComponentType = { + message: string; + description: string; +}; + +export type LoadingComponentProps = { + remSize: number; +}; diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts index 42fbe8773..ca100b5c3 100644 --- a/src/frontend/src/utils/styleUtils.ts +++ b/src/frontend/src/utils/styleUtils.ts @@ -56,6 +56,7 @@ import { TerminalSquare, Trash2, Undo, + Unplug, Upload, Users2, Variable, @@ -275,4 +276,5 @@ export const nodeIconsLucide = { Upload, MessageSquare, MoreHorizontal, + Unplug, }; From 130dc7ead6b084ac64a887633f4823e8770c72fd Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Wed, 23 Aug 2023 21:12:11 -0300 Subject: [PATCH 072/134] =?UTF-8?q?=F0=9F=94=A7=20fix(schemas.py):=20impor?= =?UTF-8?q?t=20ApiKeyRead=20from=20api=5Fkey=20module=20to=20fix=20missing?= =?UTF-8?q?=20import=20error=20=F0=9F=94=A7=20fix(models/=5F=5Finit=5F=5F.?= =?UTF-8?q?py):=20add=20ApiKey=20to=20=5F=5Fall=5F=5F=20list=20to=20fix=20?= =?UTF-8?q?missing=20import=20error=20=E2=9C=A8=20feat(models/api=5Fkey.py?= =?UTF-8?q?):=20add=20ApiKey=20model=20and=20its=20related=20classes=20to?= =?UTF-8?q?=20support=20API=20key=20functionality?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/schemas.py | 7 +++++ .../services/database/models/__init__.py | 3 +- .../services/database/models/api_key.py | 28 +++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 src/backend/langflow/services/database/models/api_key.py diff --git a/src/backend/langflow/api/v1/schemas.py b/src/backend/langflow/api/v1/schemas.py index 65bf64dca..d188e5c7a 100644 --- a/src/backend/langflow/api/v1/schemas.py +++ b/src/backend/langflow/api/v1/schemas.py @@ -1,6 +1,7 @@ from enum import Enum from pathlib import Path from typing import Any, Dict, List, Optional, Union +from langflow.services.database.models.api_key import ApiKeyRead from langflow.services.database.models.flow import FlowCreate, FlowRead from pydantic import BaseModel, Field, validator import json @@ -134,3 +135,9 @@ class ComponentListCreate(BaseModel): class ComponentListRead(BaseModel): flows: List[FlowRead] + + +class ApiKeyResponse(BaseModel): + total_count: int + user_id: str + api_keys: List[ApiKeyRead] diff --git a/src/backend/langflow/services/database/models/__init__.py b/src/backend/langflow/services/database/models/__init__.py index 28d2b4af8..01e81e277 100644 --- a/src/backend/langflow/services/database/models/__init__.py +++ b/src/backend/langflow/services/database/models/__init__.py @@ -1,5 +1,6 @@ from .flow import Flow from .user import User from .token import Token +from .api_key import ApiKey -__all__ = ["Flow", "User", "Token"] +__all__ = ["Flow", "User", "Token", "ApiKey"] diff --git a/src/backend/langflow/services/database/models/api_key.py b/src/backend/langflow/services/database/models/api_key.py new file mode 100644 index 000000000..3549c10c4 --- /dev/null +++ b/src/backend/langflow/services/database/models/api_key.py @@ -0,0 +1,28 @@ +from sqlmodel import Field +from uuid import UUID, uuid4 +from typing import Optional +from datetime import datetime +from langflow.services.database.models.base import SQLModelSerializable, SQLModel + + +class ApiKeyBase(SQLModelSerializable): + api_key: str = Field(index=True, unique=True) + name: str = Field() + create_at: datetime = Field(default_factory=datetime.utcnow) + last_used_at: Optional[datetime] = Field() + + +class ApiKey(ApiKeyBase, table=True): + id: UUID = Field(default_factory=uuid4, primary_key=True, unique=True) + + +class ApiKeyCreate(SQLModel): + name: str = Field() + + +class ApiKeyRead(SQLModel): + id: UUID = Field(default_factory=uuid4, primary_key=True, unique=True) + api_key: str = Field(index=True, unique=True) + name: str = Field() + create_at: datetime = Field(default_factory=datetime.utcnow) + last_used_at: Optional[datetime] = Field() From eca7a56f761e3fe9efe5d56fb9330fd00c05d8c9 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Wed, 23 Aug 2023 21:30:43 -0300 Subject: [PATCH 073/134] =?UTF-8?q?=F0=9F=94=96=20chore(pyproject.toml):?= =?UTF-8?q?=20bump=20version=20from=200.4.13=20to=200.4.14=20for=20langflo?= =?UTF-8?q?w=20package?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1475ef5ad..cc0d1a617 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "langflow" -version = "0.4.13" +version = "0.4.14" description = "A Python package with a built-in web application" authors = ["Logspace "] maintainers = [ From 63ca40850631a8a3b2c5f2234d70101c6095817e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Wed, 23 Aug 2023 21:43:14 -0300 Subject: [PATCH 074/134] =?UTF-8?q?=F0=9F=94=A7=20chore(alembic):=20add=20?= =?UTF-8?q?ApiKey=20table=20and=20remove=20FlowStyle=20and=20Component=20t?= =?UTF-8?q?ables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔄 refactor(alembic): downgrade migration to recreate FlowStyle and Component tables and remove User and ApiKey tables --- .../versions/5512e39b4012_add_apikey_table.py | 84 +++++++++++++++++++ .../services/database/models/api_key.py | 18 ++-- 2 files changed, 91 insertions(+), 11 deletions(-) create mode 100644 src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py diff --git a/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py b/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py new file mode 100644 index 000000000..8c8ae75fd --- /dev/null +++ b/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py @@ -0,0 +1,84 @@ +"""Add ApiKey table + +Revision ID: 5512e39b4012 +Revises: 0a534bdfd84b +Create Date: 2023-08-23 21:05:51.042203 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +import sqlmodel + + +# revision identifiers, used by Alembic. +revision: str = '5512e39b4012' +down_revision: Union[str, None] = '0a534bdfd84b' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('apikey', + sa.Column('api_key', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('create_at', sa.DateTime(), nullable=False), + sa.Column('last_used_at', sa.DateTime(), nullable=True), + sa.Column('id', sqlmodel.sql.sqltypes.GUID(), nullable=False), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('id') + ) + op.create_index(op.f('ix_apikey_api_key'), 'apikey', ['api_key'], unique=True) + op.create_table('user', + sa.Column('id', sqlmodel.sql.sqltypes.GUID(), nullable=False), + sa.Column('username', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('password', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('is_active', sa.Boolean(), nullable=False), + sa.Column('is_superuser', sa.Boolean(), nullable=False), + sa.Column('create_at', sa.DateTime(), nullable=False), + sa.Column('updated_at', sa.DateTime(), nullable=False), + sa.Column('last_login_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('id') + ) + op.create_index(op.f('ix_user_username'), 'user', ['username'], unique=True) + op.drop_table('flowstyle') + op.drop_index('ix_component_frontend_node_id', table_name='component') + op.drop_index('ix_component_name', table_name='component') + op.drop_table('component') + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('component', + sa.Column('id', sa.CHAR(length=32), nullable=False), + sa.Column('frontend_node_id', sa.CHAR(length=32), nullable=False), + sa.Column('name', sa.VARCHAR(), nullable=False), + sa.Column('description', sa.VARCHAR(), nullable=True), + sa.Column('python_code', sa.VARCHAR(), nullable=True), + sa.Column('return_type', sa.VARCHAR(), nullable=True), + sa.Column('is_disabled', sa.BOOLEAN(), nullable=False), + sa.Column('is_read_only', sa.BOOLEAN(), nullable=False), + sa.Column('create_at', sa.DATETIME(), nullable=False), + sa.Column('update_at', sa.DATETIME(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_index('ix_component_name', 'component', ['name'], unique=False) + op.create_index('ix_component_frontend_node_id', 'component', ['frontend_node_id'], unique=False) + op.create_table('flowstyle', + sa.Column('color', sa.VARCHAR(), nullable=False), + sa.Column('emoji', sa.VARCHAR(), nullable=False), + sa.Column('flow_id', sa.CHAR(length=32), nullable=True), + sa.Column('id', sa.CHAR(length=32), nullable=False), + sa.ForeignKeyConstraint(['flow_id'], ['flow.id'], ), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('id') + ) + op.drop_index(op.f('ix_user_username'), table_name='user') + op.drop_table('user') + op.drop_index(op.f('ix_apikey_api_key'), table_name='apikey') + op.drop_table('apikey') + # ### end Alembic commands ### diff --git a/src/backend/langflow/services/database/models/api_key.py b/src/backend/langflow/services/database/models/api_key.py index 3549c10c4..784b25229 100644 --- a/src/backend/langflow/services/database/models/api_key.py +++ b/src/backend/langflow/services/database/models/api_key.py @@ -2,27 +2,23 @@ from sqlmodel import Field from uuid import UUID, uuid4 from typing import Optional from datetime import datetime -from langflow.services.database.models.base import SQLModelSerializable, SQLModel +from langflow.services.database.models.base import SQLModelSerializable class ApiKeyBase(SQLModelSerializable): api_key: str = Field(index=True, unique=True) - name: str = Field() + name: Optional[str] = Field(index=True) create_at: datetime = Field(default_factory=datetime.utcnow) - last_used_at: Optional[datetime] = Field() + last_used_at: Optional[datetime] = Field(default=None) class ApiKey(ApiKeyBase, table=True): id: UUID = Field(default_factory=uuid4, primary_key=True, unique=True) -class ApiKeyCreate(SQLModel): - name: str = Field() +class ApiKeyCreate(ApiKeyBase): + pass -class ApiKeyRead(SQLModel): - id: UUID = Field(default_factory=uuid4, primary_key=True, unique=True) - api_key: str = Field(index=True, unique=True) - name: str = Field() - create_at: datetime = Field(default_factory=datetime.utcnow) - last_used_at: Optional[datetime] = Field() +class ApiKeyRead(ApiKeyBase): + id: UUID From fd6ef1815b964839d07e118aef77883c19ef44eb Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Wed, 23 Aug 2023 21:43:23 -0300 Subject: [PATCH 075/134] format --- docker-compose.debug.yml | 66 ++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml index 6a9802e38..c73ff2a60 100644 --- a/docker-compose.debug.yml +++ b/docker-compose.debug.yml @@ -1,33 +1,33 @@ -version: "3.4" - -services: - backend: - volumes: - - ./:/app - build: - context: ./ - dockerfile: ./dev.Dockerfile - command: - [ - "sh", - "-c", - "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m uvicorn --factory src.backend.langflow.main:create_app --host 0.0.0.0 --port 7860 --reload", - ] - ports: - - 7860:7860 - - 5678:5678 - restart: on-failure - - frontend: - build: - context: ./src/frontend - dockerfile: ./dev.Dockerfile - args: - - BACKEND_URL=http://backend:7860 - ports: - - "3000:3000" - volumes: - - ./src/frontend/public:/home/node/app/public - - ./src/frontend/src:/home/node/app/src - - ./src/frontend/package.json:/home/node/app/package.json - restart: on-failure +version: "3.4" + +services: + backend: + volumes: + - ./:/app + build: + context: ./ + dockerfile: ./dev.Dockerfile + command: + [ + "sh", + "-c", + "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m uvicorn --factory src.backend.langflow.main:create_app --host 0.0.0.0 --port 7860 --reload", + ] + ports: + - 7860:7860 + - 5678:5678 + restart: on-failure + + frontend: + build: + context: ./src/frontend + dockerfile: ./dev.Dockerfile + args: + - BACKEND_URL=http://backend:7860 + ports: + - "3000:3000" + volumes: + - ./src/frontend/public:/home/node/app/public + - ./src/frontend/src:/home/node/app/src + - ./src/frontend/package.json:/home/node/app/package.json + restart: on-failure From cdd25dbeb215fe9a8751f6f048dc5123f7717d65 Mon Sep 17 00:00:00 2001 From: DiogenesBR Date: Thu, 24 Aug 2023 14:55:40 +0000 Subject: [PATCH 076/134] add some new types to the .gitattributes --- .gitattributes | 4 + .githooks/pre-commit | 0 docs/static/data/organizations-100.csv | 202 ++++++++++++------------- docs/static/img/logo.svg | Bin 32058 -> 32057 bytes src/frontend/set_proxy.sh | 0 5 files changed, 105 insertions(+), 101 deletions(-) mode change 100755 => 100644 .githooks/pre-commit mode change 100755 => 100644 src/frontend/set_proxy.sh diff --git a/.gitattributes b/.gitattributes index aa545d82f..616cbc4c5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,6 +15,10 @@ *.svg text *.yml text *.yaml text +*.xml text +*.csv text +*.json text +*.sh text *.Dockerfile text Dockerfile text diff --git a/.githooks/pre-commit b/.githooks/pre-commit old mode 100755 new mode 100644 diff --git a/docs/static/data/organizations-100.csv b/docs/static/data/organizations-100.csv index 93dcac9f3..a111992d7 100644 --- a/docs/static/data/organizations-100.csv +++ b/docs/static/data/organizations-100.csv @@ -1,101 +1,101 @@ -Index,Organization Id,Name,Website,Country,Description,Founded,Industry,Number of employees -1,FAB0d41d5b5d22c,Ferrell LLC,https://price.net/,Papua New Guinea,Horizontal empowering knowledgebase,1990,Plastics,3498 -2,6A7EdDEA9FaDC52,"Mckinney, Riley and Day",http://www.hall-buchanan.info/,Finland,User-centric system-worthy leverage,2015,Glass / Ceramics / Concrete,4952 -3,0bFED1ADAE4bcC1,Hester Ltd,http://sullivan-reed.com/,China,Switchable scalable moratorium,1971,Public Safety,5287 -4,2bFC1Be8a4ce42f,Holder-Sellers,https://becker.com/,Turkmenistan,De-engineered systemic artificial intelligence,2004,Automotive,921 -5,9eE8A6a4Eb96C24,Mayer Group,http://www.brewer.com/,Mauritius,Synchronized needs-based challenge,1991,Transportation,7870 -6,cC757116fe1C085,Henry-Thompson,http://morse.net/,Bahamas,Face-to-face well-modulated customer loyalty,1992,Primary / Secondary Education,4914 -7,219233e8aFF1BC3,Hansen-Everett,https://www.kidd.org/,Pakistan,Seamless disintermediate collaboration,2018,Publishing Industry,7832 -8,ccc93DCF81a31CD,Mcintosh-Mora,https://www.brooks.com/,Heard Island and McDonald Islands,Centralized attitude-oriented capability,1970,Import / Export,4389 -9,0B4F93aA06ED03e,Carr Inc,http://ross.com/,Kuwait,Distributed impactful customer loyalty,1996,Plastics,8167 -10,738b5aDe6B1C6A5,Gaines Inc,http://sandoval-hooper.com/,Uzbekistan,Multi-lateral scalable protocol,1997,Outsourcing / Offshoring,9698 -11,AE61b8Ffebbc476,Kidd Group,http://www.lyons.com/,Bouvet Island (Bouvetoya),Proactive foreground paradigm,2001,Primary / Secondary Education,7473 -12,eb3B7D06cCdD609,Crane-Clarke,https://www.sandoval.com/,Denmark,Front-line clear-thinking encryption,2014,Food / Beverages,9011 -13,8D0c29189C9798B,"Keller, Campos and Black",https://www.garner.info/,Liberia,Ameliorated directional emulation,2020,Museums / Institutions,2862 -14,D2c91cc03CA394c,Glover-Pope,http://www.silva.biz/,United Arab Emirates,Persevering contextually-based approach,2013,Medical Practice,9079 -15,C8AC1eaf9C036F4,Pacheco-Spears,https://aguilar.com/,Sweden,Secured logistical synergy,1984,Maritime,769 -16,b5D10A14f7a8AfE,Hodge-Ayers,http://www.archer-elliott.com/,Honduras,Future-proofed radical implementation,1990,Facilities Services,8508 -17,68139b5C4De03B4,"Bowers, Guerra and Krause",http://www.carrillo-nicholson.com/,Uganda,De-engineered transitional strategy,1972,Primary / Secondary Education,6986 -18,5c2EffEfdba2BdF,Mckenzie-Melton,http://montoya-thompson.com/,Hong Kong,Reverse-engineered heuristic alliance,1998,Investment Management / Hedge Fund / Private Equity,4589 -19,ba179F19F7925f5,Branch-Mann,http://www.lozano.com/,Botswana,Adaptive intangible frame,1999,Architecture / Planning,7961 -20,c1Ce9B350BAc66b,Weiss and Sons,https://barrett.com/,Korea,Sharable optimal functionalities,2011,Plastics,5984 -21,8de40AC4e6EaCa4,"Velez, Payne and Coffey",http://burton.com/,Luxembourg,Mandatory coherent synergy,1986,Wholesale,5010 -22,Aad86a4F0385F2d,Harrell LLC,http://www.frey-rosario.com/,Guadeloupe,Reverse-engineered mission-critical moratorium,2018,Construction,2185 -23,22aC3FFd64fD703,"Eaton, Reynolds and Vargas",http://www.freeman.biz/,Monaco,Self-enabling multi-tasking process improvement,2014,Luxury Goods / Jewelry,8987 -24,5Ec4C272bCf085c,Robbins-Cummings,http://donaldson-wilkins.com/,Belgium,Organic non-volatile hierarchy,1991,Pharmaceuticals,5038 -25,5fDBeA8BB91a000,Jenkins Inc,http://www.kirk.biz/,South Africa,Front-line systematic help-desk,2002,Insurance,1215 -26,dFfD6a6F9AC2d9C,"Greene, Benjamin and Novak",http://www.kent.net/,Romania,Centralized leadingedge moratorium,2012,Museums / Institutions,4941 -27,4B217cC5a0674C5,"Dickson, Richmond and Clay",http://everett.com/,Czech Republic,Team-oriented tangible complexity,1980,Real Estate / Mortgage,3122 -28,88b1f1cDcf59a37,Prince-David,http://thompson.com/,Christmas Island,Virtual holistic methodology,1970,Banking / Mortgage,1046 -29,f9F7bBCAEeC360F,Ayala LLC,http://www.zhang.com/,Philippines,Open-source zero administration hierarchy,2021,Legal Services,7664 -30,7Cb3AeFcE4Ba31e,Rivas Group,https://hebert.org/,Australia,Open-architected well-modulated capacity,1998,Logistics / Procurement,4155 -31,ccBcC32adcbc530,"Sloan, Mays and Whitehead",http://lawson.com/,Chad,Face-to-face high-level conglomeration,1997,Civil Engineering,365 -32,f5afd686b3d05F5,"Durham, Allen and Barnes",http://chan-stafford.org/,Zimbabwe,Synergistic web-enabled framework,1993,Mechanical or Industrial Engineering,6135 -33,38C6cfC5074Fa5e,Fritz-Franklin,http://www.lambert.com/,Nepal,Automated 4thgeneration website,1972,Hospitality,4516 -34,5Cd7efccCcba38f,Burch-Ewing,http://cline.net/,Taiwan,User-centric 4thgeneration system engine,1981,Venture Capital / VC,7443 -35,9E6Acb51e3F9d6F,"Glass, Barrera and Turner",https://dunlap.com/,Kyrgyz Republic,Multi-channeled 3rdgeneration open system,2020,Utilities,2610 -36,4D4d7E18321eaeC,Pineda-Cox,http://aguilar.org/,Bolivia,Fundamental asynchronous capability,2010,Human Resources / HR,1312 -37,485f5d06B938F2b,"Baker, Mccann and Macdonald",http://www.anderson-barker.com/,Kenya,Cross-group user-facing focus group,2013,Legislative Office,1638 -38,19E3a5Bf6dBDc4F,Cuevas-Moss,https://dodson-castaneda.net/,Guatemala,Extended human-resource intranet,1994,Music,9995 -39,6883A965c7b68F7,Hahn PLC,http://newman.com/,Belarus,Organic logistical leverage,2012,Electrical / Electronic Manufacturing,3715 -40,AC5B7AA74Aa4A2E,"Valentine, Ferguson and Kramer",http://stuart.net/,Jersey,Centralized secondary time-frame,1997,Non - Profit / Volunteering,3585 -41,decab0D5027CA6a,Arroyo Inc,https://www.turner.com/,Grenada,Managed demand-driven website,2006,Writing / Editing,9067 -42,dF084FbBb613eea,Walls LLC,http://www.reese-vasquez.biz/,Cape Verde,Self-enabling fresh-thinking installation,1989,Investment Management / Hedge Fund / Private Equity,1678 -43,A2D89Ab9bCcAd4e,"Mitchell, Warren and Schneider",https://fox.biz/,Trinidad and Tobago,Enhanced intangible time-frame,2021,Capital Markets / Hedge Fund / Private Equity,3816 -44,77aDc905434a49f,Prince PLC,https://www.watts.com/,Sweden,Profit-focused coherent installation,2016,Individual / Family Services,7645 -45,235fdEFE2cfDa5F,Brock-Blackwell,http://www.small.com/,Benin,Secured foreground emulation,1986,Online Publishing,7034 -46,1eD64cFe986BBbE,Walton-Barnett,https://ashley-schaefer.com/,Western Sahara,Right-sized clear-thinking flexibility,2001,Luxury Goods / Jewelry,1746 -47,CbBbFcdd0eaE2cF,Bartlett-Arroyo,https://cruz.com/,Northern Mariana Islands,Realigned didactic function,1976,Civic / Social Organization,3987 -48,49aECbDaE6aBD53,"Wallace, Madden and Morris",http://www.blevins-fernandez.biz/,Germany,Persistent real-time customer loyalty,2016,Pharmaceuticals,9443 -49,7b3fe6e7E72bFa4,Berg-Sparks,https://cisneros-love.com/,Canada,Stand-alone static implementation,1974,Arts / Crafts,2073 -50,c6DedA82A8aef7E,Gonzales Ltd,http://bird.com/,Tonga,Managed human-resource policy,1988,Consumer Goods,9069 -51,7D9FBF85cdC3871,Lawson and Sons,https://www.wong.com/,French Southern Territories,Compatible analyzing intranet,2021,Arts / Crafts,3527 -52,7dd18Fb7cB07b65,"Mcguire, Mcconnell and Olsen",https://melton-briggs.com/,Korea,Profound client-server frame,1988,Printing,8445 -53,EF5B55FadccB8Fe,Charles-Phillips,https://bowman.com/,Cote d'Ivoire,Monitored client-server implementation,2012,Mental Health Care,3450 -54,f8D4B99e11fAF5D,Odom Ltd,https://www.humphrey-hess.com/,Cote d'Ivoire,Advanced static process improvement,2012,Management Consulting,1825 -55,e24D21BFd3bF1E5,Richard PLC,https://holden-coleman.net/,Mayotte,Object-based optimizing model,1971,Broadcast Media,4942 -56,B9BdfEB6D3Ca44E,Sampson Ltd,https://blevins.com/,Cayman Islands,Intuitive local adapter,2005,Farming,1418 -57,2a74D6f3D3B268e,"Cherry, Le and Callahan",https://waller-delacruz.biz/,Nigeria,Universal human-resource collaboration,2017,Entertainment / Movie Production,7202 -58,Bf3F3f62c8aBC33,Cherry PLC,https://www.avila.info/,Marshall Islands,Persistent tertiary website,1980,Plastics,8245 -59,aeBe26B80a7a23c,Melton-Nichols,https://kennedy.com/,Palau,User-friendly clear-thinking productivity,2021,Legislative Office,8741 -60,aAeb29ad43886C6,Potter-Walsh,http://thomas-french.org/,Turkey,Optional non-volatile open system,2008,Human Resources / HR,6923 -61,bD1bc6bB6d1FeD3,Freeman-Chen,https://mathis.com/,Timor-Leste,Phased next generation adapter,1973,International Trade / Development,346 -62,EB9f456e8b7022a,Soto Group,https://norris.info/,Vietnam,Enterprise-wide executive installation,1988,Business Supplies / Equipment,9097 -63,Dfef38C51D8DAe3,"Poole, Cruz and Whitney",https://reed.info/,Reunion,Balanced analyzing groupware,1978,Marketing / Advertising / Sales,2992 -64,055ffEfB2Dd95B0,Riley Ltd,http://wiley.com/,Brazil,Optional exuding superstructure,1986,Textiles,9315 -65,cBfe4dbAE1699da,"Erickson, Andrews and Bailey",https://www.hobbs-grant.com/,Eritrea,Vision-oriented secondary project,2014,Consumer Electronics,7829 -66,fdFbecbadcdCdf1,"Wilkinson, Charles and Arroyo",http://hunter-mcfarland.com/,United States Virgin Islands,Assimilated 24/7 archive,1996,Building Materials,602 -67,5DCb8A5a5ca03c0,Floyd Ltd,http://www.whitney.com/,Falkland Islands (Malvinas),Function-based fault-tolerant concept,2017,Public Relations / PR,2911 -68,ce57DCbcFD6d618,Newman-Galloway,https://www.scott.com/,Luxembourg,Enhanced foreground collaboration,1987,Information Technology / IT,3934 -69,5aaD187dc929371,Frazier-Butler,https://www.daugherty-farley.info/,Northern Mariana Islands,Persistent interactive circuit,1972,Outsourcing / Offshoring,5130 -70,902D7Ac8b6d476b,Newton Inc,https://www.richmond-manning.info/,Netherlands Antilles,Fundamental stable info-mediaries,1976,Military Industry,563 -71,32BB9Ff4d939788,Duffy-Levy,https://www.potter.com/,Guernsey,Diverse exuding installation,1982,Wireless,6146 -72,adcB0afbE58bAe3,Wagner LLC,https://decker-esparza.com/,Uruguay,Reactive attitude-oriented toolset,1987,International Affairs,6874 -73,dfcA1c84AdB61Ac,Mccall-Holmes,http://www.dean.com/,Benin,Object-based value-added database,2009,Legal Services,696 -74,208044AC2fe52F3,Massey LLC,https://frazier.biz/,Suriname,Configurable zero administration Graphical User Interface,1986,Accounting,5004 -75,f3C365f0c1A0623,Hicks LLC,http://alvarez.biz/,Pakistan,Quality-focused client-server Graphical User Interface,1970,Computer Software / Engineering,8480 -76,ec5Bdd3CBAfaB93,"Cole, Russell and Avery",http://www.blankenship.com/,Mongolia,De-engineered fault-tolerant challenge,2000,Law Enforcement,7012 -77,DDB19Be7eeB56B4,Cummings-Rojas,https://simon-pearson.com/,Svalbard & Jan Mayen Islands,User-centric modular customer loyalty,2012,Financial Services,7529 -78,dd6CA3d0bc3cAfc,"Beasley, Greene and Mahoney",http://www.petersen-lawrence.com/,Togo,Extended content-based methodology,1976,Religious Institutions,869 -79,A0B9d56e61070e3,"Beasley, Sims and Allison",http://burke.info/,Latvia,Secured zero tolerance hub,1972,Facilities Services,6182 -80,cBa7EFe5D05Adaf,Crawford-Rivera,https://black-ramirez.org/,Cuba,Persevering exuding budgetary management,1999,Online Publishing,7805 -81,Ea3f6D52Ec73563,Montes-Hensley,https://krueger.org/,Liechtenstein,Multi-tiered secondary productivity,2009,Printing,8433 -82,bC0CEd48A8000E0,Velazquez-Odom,https://stokes.com/,Djibouti,Streamlined 6thgeneration function,2002,Alternative Dispute Resolution,4044 -83,c89b9b59BC4baa1,Eaton-Morales,https://www.reeves-graham.com/,Micronesia,Customer-focused explicit frame,1990,Capital Markets / Hedge Fund / Private Equity,7013 -84,FEC51bce8421a7b,"Roberson, Pennington and Palmer",http://www.keith-fisher.com/,Cameroon,Adaptive bi-directional hierarchy,1993,Telecommunications,5571 -85,e0E8e27eAc9CAd5,"George, Russo and Guerra",https://drake.com/,Sweden,Centralized non-volatile capability,1989,Military Industry,2880 -86,B97a6CF9bf5983C,Davila Inc,https://mcconnell.info/,Cocos (Keeling) Islands,Profit-focused dedicated frame,2017,Consumer Electronics,2215 -87,a0a6f9b3DbcBEb5,Mays-Preston,http://www.browning-key.com/,Mali,User-centric heuristic focus group,2006,Military Industry,5786 -88,8cC1bDa330a5871,Pineda-Morton,https://www.carr.com/,United States Virgin Islands,Grass-roots methodical info-mediaries,1991,Printing,6168 -89,ED889CB2FE9cbd3,Huang and Sons,https://www.bolton.com/,Eritrea,Re-contextualized dynamic hierarchy,1981,Semiconductors,7484 -90,F4Dc1417BC6cb8f,Gilbert-Simon,https://www.bradford.biz/,Burundi,Grass-roots radical parallelism,1973,Newspapers / Journalism,1927 -91,7ABc3c7ecA03B34,Sampson-Griffith,http://hendricks.org/,Benin,Multi-layered composite paradigm,1972,Textiles,3881 -92,4e0719FBE38e0aB,Miles-Dominguez,http://www.turner.com/,Gibraltar,Organized empowering forecast,1996,Civic / Social Organization,897 -93,dEbDAAeDfaed00A,Rowe and Sons,https://www.simpson.org/,El Salvador,Balanced multimedia knowledgebase,1978,Facilities Services,8172 -94,61BDeCfeFD0cEF5,"Valenzuela, Holmes and Rowland",https://www.dorsey.net/,Taiwan,Persistent tertiary focus group,1999,Transportation,1483 -95,4e91eD25f486110,"Best, Wade and Shepard",https://zimmerman.com/,Zimbabwe,Innovative background definition,1991,Gambling / Casinos,4873 -96,0a0bfFbBbB8eC7c,Holmes Group,https://mcdowell.org/,Ethiopia,Right-sized zero tolerance focus group,1975,Photography,2988 -97,BA6Cd9Dae2Efd62,Good Ltd,http://duffy.com/,Anguilla,Reverse-engineered composite moratorium,1971,Consumer Services,4292 -98,E7df80C60Abd7f9,Clements-Espinoza,http://www.flowers.net/,Falkland Islands (Malvinas),Progressive modular hub,1991,Broadcast Media,236 -99,AFc285dbE2fEd24,Mendez Inc,https://www.burke.net/,Kyrgyz Republic,User-friendly exuding migration,1993,Education Management,339 -100,e9eB5A60Cef8354,Watkins-Kaiser,http://www.herring.com/,Togo,Synergistic background access,2009,Financial Services,2785 +Index,Organization Id,Name,Website,Country,Description,Founded,Industry,Number of employees +1,FAB0d41d5b5d22c,Ferrell LLC,https://price.net/,Papua New Guinea,Horizontal empowering knowledgebase,1990,Plastics,3498 +2,6A7EdDEA9FaDC52,"Mckinney, Riley and Day",http://www.hall-buchanan.info/,Finland,User-centric system-worthy leverage,2015,Glass / Ceramics / Concrete,4952 +3,0bFED1ADAE4bcC1,Hester Ltd,http://sullivan-reed.com/,China,Switchable scalable moratorium,1971,Public Safety,5287 +4,2bFC1Be8a4ce42f,Holder-Sellers,https://becker.com/,Turkmenistan,De-engineered systemic artificial intelligence,2004,Automotive,921 +5,9eE8A6a4Eb96C24,Mayer Group,http://www.brewer.com/,Mauritius,Synchronized needs-based challenge,1991,Transportation,7870 +6,cC757116fe1C085,Henry-Thompson,http://morse.net/,Bahamas,Face-to-face well-modulated customer loyalty,1992,Primary / Secondary Education,4914 +7,219233e8aFF1BC3,Hansen-Everett,https://www.kidd.org/,Pakistan,Seamless disintermediate collaboration,2018,Publishing Industry,7832 +8,ccc93DCF81a31CD,Mcintosh-Mora,https://www.brooks.com/,Heard Island and McDonald Islands,Centralized attitude-oriented capability,1970,Import / Export,4389 +9,0B4F93aA06ED03e,Carr Inc,http://ross.com/,Kuwait,Distributed impactful customer loyalty,1996,Plastics,8167 +10,738b5aDe6B1C6A5,Gaines Inc,http://sandoval-hooper.com/,Uzbekistan,Multi-lateral scalable protocol,1997,Outsourcing / Offshoring,9698 +11,AE61b8Ffebbc476,Kidd Group,http://www.lyons.com/,Bouvet Island (Bouvetoya),Proactive foreground paradigm,2001,Primary / Secondary Education,7473 +12,eb3B7D06cCdD609,Crane-Clarke,https://www.sandoval.com/,Denmark,Front-line clear-thinking encryption,2014,Food / Beverages,9011 +13,8D0c29189C9798B,"Keller, Campos and Black",https://www.garner.info/,Liberia,Ameliorated directional emulation,2020,Museums / Institutions,2862 +14,D2c91cc03CA394c,Glover-Pope,http://www.silva.biz/,United Arab Emirates,Persevering contextually-based approach,2013,Medical Practice,9079 +15,C8AC1eaf9C036F4,Pacheco-Spears,https://aguilar.com/,Sweden,Secured logistical synergy,1984,Maritime,769 +16,b5D10A14f7a8AfE,Hodge-Ayers,http://www.archer-elliott.com/,Honduras,Future-proofed radical implementation,1990,Facilities Services,8508 +17,68139b5C4De03B4,"Bowers, Guerra and Krause",http://www.carrillo-nicholson.com/,Uganda,De-engineered transitional strategy,1972,Primary / Secondary Education,6986 +18,5c2EffEfdba2BdF,Mckenzie-Melton,http://montoya-thompson.com/,Hong Kong,Reverse-engineered heuristic alliance,1998,Investment Management / Hedge Fund / Private Equity,4589 +19,ba179F19F7925f5,Branch-Mann,http://www.lozano.com/,Botswana,Adaptive intangible frame,1999,Architecture / Planning,7961 +20,c1Ce9B350BAc66b,Weiss and Sons,https://barrett.com/,Korea,Sharable optimal functionalities,2011,Plastics,5984 +21,8de40AC4e6EaCa4,"Velez, Payne and Coffey",http://burton.com/,Luxembourg,Mandatory coherent synergy,1986,Wholesale,5010 +22,Aad86a4F0385F2d,Harrell LLC,http://www.frey-rosario.com/,Guadeloupe,Reverse-engineered mission-critical moratorium,2018,Construction,2185 +23,22aC3FFd64fD703,"Eaton, Reynolds and Vargas",http://www.freeman.biz/,Monaco,Self-enabling multi-tasking process improvement,2014,Luxury Goods / Jewelry,8987 +24,5Ec4C272bCf085c,Robbins-Cummings,http://donaldson-wilkins.com/,Belgium,Organic non-volatile hierarchy,1991,Pharmaceuticals,5038 +25,5fDBeA8BB91a000,Jenkins Inc,http://www.kirk.biz/,South Africa,Front-line systematic help-desk,2002,Insurance,1215 +26,dFfD6a6F9AC2d9C,"Greene, Benjamin and Novak",http://www.kent.net/,Romania,Centralized leadingedge moratorium,2012,Museums / Institutions,4941 +27,4B217cC5a0674C5,"Dickson, Richmond and Clay",http://everett.com/,Czech Republic,Team-oriented tangible complexity,1980,Real Estate / Mortgage,3122 +28,88b1f1cDcf59a37,Prince-David,http://thompson.com/,Christmas Island,Virtual holistic methodology,1970,Banking / Mortgage,1046 +29,f9F7bBCAEeC360F,Ayala LLC,http://www.zhang.com/,Philippines,Open-source zero administration hierarchy,2021,Legal Services,7664 +30,7Cb3AeFcE4Ba31e,Rivas Group,https://hebert.org/,Australia,Open-architected well-modulated capacity,1998,Logistics / Procurement,4155 +31,ccBcC32adcbc530,"Sloan, Mays and Whitehead",http://lawson.com/,Chad,Face-to-face high-level conglomeration,1997,Civil Engineering,365 +32,f5afd686b3d05F5,"Durham, Allen and Barnes",http://chan-stafford.org/,Zimbabwe,Synergistic web-enabled framework,1993,Mechanical or Industrial Engineering,6135 +33,38C6cfC5074Fa5e,Fritz-Franklin,http://www.lambert.com/,Nepal,Automated 4thgeneration website,1972,Hospitality,4516 +34,5Cd7efccCcba38f,Burch-Ewing,http://cline.net/,Taiwan,User-centric 4thgeneration system engine,1981,Venture Capital / VC,7443 +35,9E6Acb51e3F9d6F,"Glass, Barrera and Turner",https://dunlap.com/,Kyrgyz Republic,Multi-channeled 3rdgeneration open system,2020,Utilities,2610 +36,4D4d7E18321eaeC,Pineda-Cox,http://aguilar.org/,Bolivia,Fundamental asynchronous capability,2010,Human Resources / HR,1312 +37,485f5d06B938F2b,"Baker, Mccann and Macdonald",http://www.anderson-barker.com/,Kenya,Cross-group user-facing focus group,2013,Legislative Office,1638 +38,19E3a5Bf6dBDc4F,Cuevas-Moss,https://dodson-castaneda.net/,Guatemala,Extended human-resource intranet,1994,Music,9995 +39,6883A965c7b68F7,Hahn PLC,http://newman.com/,Belarus,Organic logistical leverage,2012,Electrical / Electronic Manufacturing,3715 +40,AC5B7AA74Aa4A2E,"Valentine, Ferguson and Kramer",http://stuart.net/,Jersey,Centralized secondary time-frame,1997,Non - Profit / Volunteering,3585 +41,decab0D5027CA6a,Arroyo Inc,https://www.turner.com/,Grenada,Managed demand-driven website,2006,Writing / Editing,9067 +42,dF084FbBb613eea,Walls LLC,http://www.reese-vasquez.biz/,Cape Verde,Self-enabling fresh-thinking installation,1989,Investment Management / Hedge Fund / Private Equity,1678 +43,A2D89Ab9bCcAd4e,"Mitchell, Warren and Schneider",https://fox.biz/,Trinidad and Tobago,Enhanced intangible time-frame,2021,Capital Markets / Hedge Fund / Private Equity,3816 +44,77aDc905434a49f,Prince PLC,https://www.watts.com/,Sweden,Profit-focused coherent installation,2016,Individual / Family Services,7645 +45,235fdEFE2cfDa5F,Brock-Blackwell,http://www.small.com/,Benin,Secured foreground emulation,1986,Online Publishing,7034 +46,1eD64cFe986BBbE,Walton-Barnett,https://ashley-schaefer.com/,Western Sahara,Right-sized clear-thinking flexibility,2001,Luxury Goods / Jewelry,1746 +47,CbBbFcdd0eaE2cF,Bartlett-Arroyo,https://cruz.com/,Northern Mariana Islands,Realigned didactic function,1976,Civic / Social Organization,3987 +48,49aECbDaE6aBD53,"Wallace, Madden and Morris",http://www.blevins-fernandez.biz/,Germany,Persistent real-time customer loyalty,2016,Pharmaceuticals,9443 +49,7b3fe6e7E72bFa4,Berg-Sparks,https://cisneros-love.com/,Canada,Stand-alone static implementation,1974,Arts / Crafts,2073 +50,c6DedA82A8aef7E,Gonzales Ltd,http://bird.com/,Tonga,Managed human-resource policy,1988,Consumer Goods,9069 +51,7D9FBF85cdC3871,Lawson and Sons,https://www.wong.com/,French Southern Territories,Compatible analyzing intranet,2021,Arts / Crafts,3527 +52,7dd18Fb7cB07b65,"Mcguire, Mcconnell and Olsen",https://melton-briggs.com/,Korea,Profound client-server frame,1988,Printing,8445 +53,EF5B55FadccB8Fe,Charles-Phillips,https://bowman.com/,Cote d'Ivoire,Monitored client-server implementation,2012,Mental Health Care,3450 +54,f8D4B99e11fAF5D,Odom Ltd,https://www.humphrey-hess.com/,Cote d'Ivoire,Advanced static process improvement,2012,Management Consulting,1825 +55,e24D21BFd3bF1E5,Richard PLC,https://holden-coleman.net/,Mayotte,Object-based optimizing model,1971,Broadcast Media,4942 +56,B9BdfEB6D3Ca44E,Sampson Ltd,https://blevins.com/,Cayman Islands,Intuitive local adapter,2005,Farming,1418 +57,2a74D6f3D3B268e,"Cherry, Le and Callahan",https://waller-delacruz.biz/,Nigeria,Universal human-resource collaboration,2017,Entertainment / Movie Production,7202 +58,Bf3F3f62c8aBC33,Cherry PLC,https://www.avila.info/,Marshall Islands,Persistent tertiary website,1980,Plastics,8245 +59,aeBe26B80a7a23c,Melton-Nichols,https://kennedy.com/,Palau,User-friendly clear-thinking productivity,2021,Legislative Office,8741 +60,aAeb29ad43886C6,Potter-Walsh,http://thomas-french.org/,Turkey,Optional non-volatile open system,2008,Human Resources / HR,6923 +61,bD1bc6bB6d1FeD3,Freeman-Chen,https://mathis.com/,Timor-Leste,Phased next generation adapter,1973,International Trade / Development,346 +62,EB9f456e8b7022a,Soto Group,https://norris.info/,Vietnam,Enterprise-wide executive installation,1988,Business Supplies / Equipment,9097 +63,Dfef38C51D8DAe3,"Poole, Cruz and Whitney",https://reed.info/,Reunion,Balanced analyzing groupware,1978,Marketing / Advertising / Sales,2992 +64,055ffEfB2Dd95B0,Riley Ltd,http://wiley.com/,Brazil,Optional exuding superstructure,1986,Textiles,9315 +65,cBfe4dbAE1699da,"Erickson, Andrews and Bailey",https://www.hobbs-grant.com/,Eritrea,Vision-oriented secondary project,2014,Consumer Electronics,7829 +66,fdFbecbadcdCdf1,"Wilkinson, Charles and Arroyo",http://hunter-mcfarland.com/,United States Virgin Islands,Assimilated 24/7 archive,1996,Building Materials,602 +67,5DCb8A5a5ca03c0,Floyd Ltd,http://www.whitney.com/,Falkland Islands (Malvinas),Function-based fault-tolerant concept,2017,Public Relations / PR,2911 +68,ce57DCbcFD6d618,Newman-Galloway,https://www.scott.com/,Luxembourg,Enhanced foreground collaboration,1987,Information Technology / IT,3934 +69,5aaD187dc929371,Frazier-Butler,https://www.daugherty-farley.info/,Northern Mariana Islands,Persistent interactive circuit,1972,Outsourcing / Offshoring,5130 +70,902D7Ac8b6d476b,Newton Inc,https://www.richmond-manning.info/,Netherlands Antilles,Fundamental stable info-mediaries,1976,Military Industry,563 +71,32BB9Ff4d939788,Duffy-Levy,https://www.potter.com/,Guernsey,Diverse exuding installation,1982,Wireless,6146 +72,adcB0afbE58bAe3,Wagner LLC,https://decker-esparza.com/,Uruguay,Reactive attitude-oriented toolset,1987,International Affairs,6874 +73,dfcA1c84AdB61Ac,Mccall-Holmes,http://www.dean.com/,Benin,Object-based value-added database,2009,Legal Services,696 +74,208044AC2fe52F3,Massey LLC,https://frazier.biz/,Suriname,Configurable zero administration Graphical User Interface,1986,Accounting,5004 +75,f3C365f0c1A0623,Hicks LLC,http://alvarez.biz/,Pakistan,Quality-focused client-server Graphical User Interface,1970,Computer Software / Engineering,8480 +76,ec5Bdd3CBAfaB93,"Cole, Russell and Avery",http://www.blankenship.com/,Mongolia,De-engineered fault-tolerant challenge,2000,Law Enforcement,7012 +77,DDB19Be7eeB56B4,Cummings-Rojas,https://simon-pearson.com/,Svalbard & Jan Mayen Islands,User-centric modular customer loyalty,2012,Financial Services,7529 +78,dd6CA3d0bc3cAfc,"Beasley, Greene and Mahoney",http://www.petersen-lawrence.com/,Togo,Extended content-based methodology,1976,Religious Institutions,869 +79,A0B9d56e61070e3,"Beasley, Sims and Allison",http://burke.info/,Latvia,Secured zero tolerance hub,1972,Facilities Services,6182 +80,cBa7EFe5D05Adaf,Crawford-Rivera,https://black-ramirez.org/,Cuba,Persevering exuding budgetary management,1999,Online Publishing,7805 +81,Ea3f6D52Ec73563,Montes-Hensley,https://krueger.org/,Liechtenstein,Multi-tiered secondary productivity,2009,Printing,8433 +82,bC0CEd48A8000E0,Velazquez-Odom,https://stokes.com/,Djibouti,Streamlined 6thgeneration function,2002,Alternative Dispute Resolution,4044 +83,c89b9b59BC4baa1,Eaton-Morales,https://www.reeves-graham.com/,Micronesia,Customer-focused explicit frame,1990,Capital Markets / Hedge Fund / Private Equity,7013 +84,FEC51bce8421a7b,"Roberson, Pennington and Palmer",http://www.keith-fisher.com/,Cameroon,Adaptive bi-directional hierarchy,1993,Telecommunications,5571 +85,e0E8e27eAc9CAd5,"George, Russo and Guerra",https://drake.com/,Sweden,Centralized non-volatile capability,1989,Military Industry,2880 +86,B97a6CF9bf5983C,Davila Inc,https://mcconnell.info/,Cocos (Keeling) Islands,Profit-focused dedicated frame,2017,Consumer Electronics,2215 +87,a0a6f9b3DbcBEb5,Mays-Preston,http://www.browning-key.com/,Mali,User-centric heuristic focus group,2006,Military Industry,5786 +88,8cC1bDa330a5871,Pineda-Morton,https://www.carr.com/,United States Virgin Islands,Grass-roots methodical info-mediaries,1991,Printing,6168 +89,ED889CB2FE9cbd3,Huang and Sons,https://www.bolton.com/,Eritrea,Re-contextualized dynamic hierarchy,1981,Semiconductors,7484 +90,F4Dc1417BC6cb8f,Gilbert-Simon,https://www.bradford.biz/,Burundi,Grass-roots radical parallelism,1973,Newspapers / Journalism,1927 +91,7ABc3c7ecA03B34,Sampson-Griffith,http://hendricks.org/,Benin,Multi-layered composite paradigm,1972,Textiles,3881 +92,4e0719FBE38e0aB,Miles-Dominguez,http://www.turner.com/,Gibraltar,Organized empowering forecast,1996,Civic / Social Organization,897 +93,dEbDAAeDfaed00A,Rowe and Sons,https://www.simpson.org/,El Salvador,Balanced multimedia knowledgebase,1978,Facilities Services,8172 +94,61BDeCfeFD0cEF5,"Valenzuela, Holmes and Rowland",https://www.dorsey.net/,Taiwan,Persistent tertiary focus group,1999,Transportation,1483 +95,4e91eD25f486110,"Best, Wade and Shepard",https://zimmerman.com/,Zimbabwe,Innovative background definition,1991,Gambling / Casinos,4873 +96,0a0bfFbBbB8eC7c,Holmes Group,https://mcdowell.org/,Ethiopia,Right-sized zero tolerance focus group,1975,Photography,2988 +97,BA6Cd9Dae2Efd62,Good Ltd,http://duffy.com/,Anguilla,Reverse-engineered composite moratorium,1971,Consumer Services,4292 +98,E7df80C60Abd7f9,Clements-Espinoza,http://www.flowers.net/,Falkland Islands (Malvinas),Progressive modular hub,1991,Broadcast Media,236 +99,AFc285dbE2fEd24,Mendez Inc,https://www.burke.net/,Kyrgyz Republic,User-friendly exuding migration,1993,Education Management,339 +100,e9eB5A60Cef8354,Watkins-Kaiser,http://www.herring.com/,Togo,Synergistic background access,2009,Financial Services,2785 diff --git a/docs/static/img/logo.svg b/docs/static/img/logo.svg index 136c4c835821060875515cb91d27b1f056e9b95f..3972c658bbf186d4864aa945bcabab384ac91f39 100644 GIT binary patch delta 15 Wcmdn>i*e^KMwZS1KlhESrnLY$uLeW_ delta 16 Xcmdn_i*eU4M%K;%KX=}ZET**pKF|hH diff --git a/src/frontend/set_proxy.sh b/src/frontend/set_proxy.sh old mode 100755 new mode 100644 From fe3a9c61df33991a393827208951a954aa1f9786 Mon Sep 17 00:00:00 2001 From: DiogenesBR Date: Thu, 24 Aug 2023 14:57:18 +0000 Subject: [PATCH 077/134] fix the imports of orjson_dumps --- src/backend/langflow/components/utilities/GetRequest.py | 2 +- .../langflow/components/utilities/JSONDocumentBuilder.py | 2 +- src/backend/langflow/components/utilities/PostRequest.py | 2 +- src/backend/langflow/components/utilities/UpdateRequest.py | 2 +- src/backend/langflow/interface/initialize/utils.py | 2 +- src/backend/langflow/services/cache/utils.py | 2 +- src/backend/langflow/template/frontend_node/llms.py | 2 +- src/backend/langflow/template/frontend_node/utilities.py | 2 +- tests/test_cache.py | 2 +- tests/test_database.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/backend/langflow/components/utilities/GetRequest.py b/src/backend/langflow/components/utilities/GetRequest.py index c8182ad0d..13ff0dc23 100644 --- a/src/backend/langflow/components/utilities/GetRequest.py +++ b/src/backend/langflow/components/utilities/GetRequest.py @@ -1,6 +1,6 @@ from langflow import CustomComponent from langchain.schema import Document -from langflow.database.models.base import orjson_dumps +from langflow.services.database.models.base import orjson_dumps import requests from typing import Optional diff --git a/src/backend/langflow/components/utilities/JSONDocumentBuilder.py b/src/backend/langflow/components/utilities/JSONDocumentBuilder.py index e41b6b6af..26a2afd94 100644 --- a/src/backend/langflow/components/utilities/JSONDocumentBuilder.py +++ b/src/backend/langflow/components/utilities/JSONDocumentBuilder.py @@ -13,7 +13,7 @@ from langflow import CustomComponent from langchain.schema import Document -from langflow.database.models.base import orjson_dumps +from langflow.services.database.models.base import orjson_dumps class JSONDocumentBuilder(CustomComponent): diff --git a/src/backend/langflow/components/utilities/PostRequest.py b/src/backend/langflow/components/utilities/PostRequest.py index 9d5ab504f..4f7100d43 100644 --- a/src/backend/langflow/components/utilities/PostRequest.py +++ b/src/backend/langflow/components/utilities/PostRequest.py @@ -1,6 +1,6 @@ from langflow import CustomComponent from langchain.schema import Document -from langflow.database.models.base import orjson_dumps +from langflow.services.database.models.base import orjson_dumps import requests from typing import Optional diff --git a/src/backend/langflow/components/utilities/UpdateRequest.py b/src/backend/langflow/components/utilities/UpdateRequest.py index 569dac013..6e8991794 100644 --- a/src/backend/langflow/components/utilities/UpdateRequest.py +++ b/src/backend/langflow/components/utilities/UpdateRequest.py @@ -2,7 +2,7 @@ from typing import List, Optional import requests from langflow import CustomComponent from langchain.schema import Document -from langflow.database.models.base import orjson_dumps +from langflow.services.database.models.base import orjson_dumps class UpdateRequest(CustomComponent): diff --git a/src/backend/langflow/interface/initialize/utils.py b/src/backend/langflow/interface/initialize/utils.py index 116673645..199626de5 100644 --- a/src/backend/langflow/interface/initialize/utils.py +++ b/src/backend/langflow/interface/initialize/utils.py @@ -1,6 +1,6 @@ import contextlib import json -from langflow.database.models.base import orjson_dumps +from langflow.services.database.models.base import orjson_dumps import orjson from typing import Any, Dict, List diff --git a/src/backend/langflow/services/cache/utils.py b/src/backend/langflow/services/cache/utils.py index e89022167..a36243b75 100644 --- a/src/backend/langflow/services/cache/utils.py +++ b/src/backend/langflow/services/cache/utils.py @@ -8,7 +8,7 @@ from collections import OrderedDict from pathlib import Path from typing import Any, Dict from appdirs import user_cache_dir -from langflow.database.models.base import orjson_dumps +from langflow.services.database.models.base import orjson_dumps CACHE: Dict[str, Any] = {} diff --git a/src/backend/langflow/template/frontend_node/llms.py b/src/backend/langflow/template/frontend_node/llms.py index fdf0a2b5b..01098724e 100644 --- a/src/backend/langflow/template/frontend_node/llms.py +++ b/src/backend/langflow/template/frontend_node/llms.py @@ -1,5 +1,5 @@ from typing import Optional -from langflow.database.models.base import orjson_dumps +from langflow.services.database.models.base import orjson_dumps from langflow.template.field.base import TemplateField from langflow.template.frontend_node.base import FrontendNode diff --git a/src/backend/langflow/template/frontend_node/utilities.py b/src/backend/langflow/template/frontend_node/utilities.py index fa0b55332..9dedacd0f 100644 --- a/src/backend/langflow/template/frontend_node/utilities.py +++ b/src/backend/langflow/template/frontend_node/utilities.py @@ -1,6 +1,6 @@ import ast from typing import Optional -from langflow.database.models.base import orjson_dumps +from langflow.services.database.models.base import orjson_dumps from langflow.template.field.base import TemplateField from langflow.template.frontend_node.base import FrontendNode diff --git a/tests/test_cache.py b/tests/test_cache.py index f3d0cabda..edf205a05 100644 --- a/tests/test_cache.py +++ b/tests/test_cache.py @@ -1,5 +1,5 @@ import json -from langflow.database.models.base import orjson_dumps +from langflow.services.database.models.base import orjson_dumps import orjson from langflow.graph import Graph diff --git a/tests/test_database.py b/tests/test_database.py index d23d67a36..6976f963a 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -1,4 +1,4 @@ -from langflow.database.models.base import orjson_dumps +from langflow.services.database.models.base import orjson_dumps import orjson import pytest From c1c5b2242f9b13058136f4b951c4dec0bff26f7e Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Thu, 24 Aug 2023 17:08:24 -0300 Subject: [PATCH 078/134] fix(buildTrigger/index.tsx): change the success message title from "Code is ready to run" to "Flow is ready to run" for better clarity and accuracy --- .../src/components/chatComponent/buildTrigger/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/components/chatComponent/buildTrigger/index.tsx b/src/frontend/src/components/chatComponent/buildTrigger/index.tsx index 9eb25bb37..66bc0d371 100644 --- a/src/frontend/src/components/chatComponent/buildTrigger/index.tsx +++ b/src/frontend/src/components/chatComponent/buildTrigger/index.tsx @@ -62,7 +62,7 @@ export default function BuildTrigger({ } if (errors.length === 0 && allNodesValid) { setSuccessData({ - title: "Code is ready to run", + title: "Flow is ready to run", }); } } catch (error) { From 4fab63e5de028784ead3263b049e093823f73766 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Thu, 24 Aug 2023 17:10:02 -0300 Subject: [PATCH 079/134] code format --- .../components/codeTabsComponent/index.tsx | 48 +++++++++++++------ src/frontend/src/contexts/alertContext.tsx | 2 +- .../src/modals/codeAreaModal/index.tsx | 3 +- .../extraSidebarComponent/index.tsx | 3 +- .../src/types/utils/reactflowUtils.ts | 4 +- src/frontend/src/utils/reactflowUtils.ts | 5 +- 6 files changed, 44 insertions(+), 21 deletions(-) diff --git a/src/frontend/src/components/codeTabsComponent/index.tsx b/src/frontend/src/components/codeTabsComponent/index.tsx index 2c61fed56..fcd7385d7 100644 --- a/src/frontend/src/components/codeTabsComponent/index.tsx +++ b/src/frontend/src/components/codeTabsComponent/index.tsx @@ -28,13 +28,13 @@ import { TabsList, TabsTrigger, } from "../../components/ui/tabs"; +import { alertContext } from "../../contexts/alertContext"; import { darkContext } from "../../contexts/darkContext"; +import { typesContext } from "../../contexts/typesContext"; import { codeTabsPropsType } from "../../types/components"; +import { unselectAllNodes } from "../../utils/reactflowUtils"; import { classNames } from "../../utils/utils"; import IconComponent from "../genericIconComponent"; -import { unselectAllNodes } from "../../utils/reactflowUtils"; -import { typesContext } from "../../contexts/typesContext"; -import { alertContext } from "../../contexts/alertContext"; export default function CodeTabsComponent({ flow, @@ -56,19 +56,19 @@ export default function CodeTabsComponent({ setData(flow["data"]!["nodes"]); } }, [flow]); - + useEffect(() => { unselectAllNodes({ data, updateNodes: (nodes) => { reactFlowInstance?.setNodes(nodes); - } + }, }); return () => { if (isTweakPage) setIsTweakPage(false); }; - }, []) + }, []); const copyToClipboard = () => { if (!navigator.clipboard || !navigator.clipboard.writeText) { @@ -295,7 +295,9 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList![i].data.node.template[ + newInputList![ + i + ].data.node.template[ templateField ].value = target; return newInputList; @@ -342,7 +344,9 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList![i].data.node.template[ + newInputList![ + i + ].data.node.template[ templateField ].value = target; return newInputList; @@ -385,7 +389,9 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList![i].data.node.template[ + newInputList![ + i + ].data.node.template[ templateField ].value = target; return newInputList; @@ -416,7 +422,9 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList![i].data.node.template[ + newInputList![ + i + ].data.node.template[ templateField ].value = e; return newInputList; @@ -505,7 +513,9 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList![i].data.node.template[ + newInputList![ + i + ].data.node.template[ templateField ].value = target; return newInputList; @@ -539,7 +549,9 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList![i].data.node.template[ + newInputList![ + i + ].data.node.template[ templateField ].value = target; return newInputList; @@ -589,7 +601,9 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList![i].data.node.template[ + newInputList![ + i + ].data.node.template[ templateField ].value = target; return newInputList; @@ -642,7 +656,9 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList![i].data.node.template[ + newInputList![ + i + ].data.node.template[ templateField ].value = target; return newInputList; @@ -695,7 +711,9 @@ export default function CodeTabsComponent({ setData((old) => { let newInputList = cloneDeep(old); - newInputList![i].data.node.template[ + newInputList![ + i + ].data.node.template[ templateField ].value = target; return newInputList; diff --git a/src/frontend/src/contexts/alertContext.tsx b/src/frontend/src/contexts/alertContext.tsx index 46a0d8a3b..98b2fdef8 100644 --- a/src/frontend/src/contexts/alertContext.tsx +++ b/src/frontend/src/contexts/alertContext.tsx @@ -27,7 +27,7 @@ const initialValue: alertContextType = { clearNotificationList: () => {}, removeFromNotificationList: () => {}, isTweakPage: false, - setIsTweakPage: () => {}, + setIsTweakPage: () => {}, }; export const alertContext = createContext(initialValue); diff --git a/src/frontend/src/modals/codeAreaModal/index.tsx b/src/frontend/src/modals/codeAreaModal/index.tsx index e4ef45f34..5c17e42a9 100644 --- a/src/frontend/src/modals/codeAreaModal/index.tsx +++ b/src/frontend/src/modals/codeAreaModal/index.tsx @@ -28,7 +28,8 @@ export default function CodeAreaModal({ const { dark } = useContext(darkContext); const { reactFlowInstance } = useContext(typesContext); const [height, setHeight] = useState(null); - const { setErrorData, setSuccessData, isTweakPage } = useContext(alertContext); + const { setErrorData, setSuccessData, isTweakPage } = + useContext(alertContext); const [error, setError] = useState<{ detail: { error: string | undefined; traceback: string | undefined }; } | null>(null); diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx index f1a84bce9..12cd543c6 100644 --- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx @@ -21,7 +21,8 @@ export default function ExtraSidebar(): JSX.Element { const { data, templates } = useContext(typesContext); const { flows, tabId, uploadFlow, tabsState, saveFlow, isBuilt } = useContext(TabsContext); - const { setSuccessData, setErrorData, setIsTweakPage } = useContext(alertContext); + const { setSuccessData, setErrorData, setIsTweakPage } = + useContext(alertContext); const [dataFilter, setFilterData] = useState(data); const [search, setSearch] = useState(""); const isPending = tabsState[tabId]?.isPending; diff --git a/src/frontend/src/types/utils/reactflowUtils.ts b/src/frontend/src/types/utils/reactflowUtils.ts index 6ec40512d..9944fdba4 100644 --- a/src/frontend/src/types/utils/reactflowUtils.ts +++ b/src/frontend/src/types/utils/reactflowUtils.ts @@ -10,6 +10,6 @@ export type cleanEdgesType = { }; export type unselectAllNodesType = { - updateNodes: (nodes: Node[]) => void, - data: Node[] | null + updateNodes: (nodes: Node[]) => void; + data: Node[] | null; }; diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts index 6a12f3edd..87971ef9b 100644 --- a/src/frontend/src/utils/reactflowUtils.ts +++ b/src/frontend/src/utils/reactflowUtils.ts @@ -9,7 +9,10 @@ import { import { specialCharsRegex } from "../constants/constants"; import { APITemplateType } from "../types/api"; import { FlowType, NodeType } from "../types/flow"; -import { cleanEdgesType, unselectAllNodesType } from "../types/utils/reactflowUtils"; +import { + cleanEdgesType, + unselectAllNodesType, +} from "../types/utils/reactflowUtils"; import { toNormalCase } from "./utils"; export function cleanEdges({ From c49ee222be51cc214e706015d10c4a75ffdec1f2 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Thu, 24 Aug 2023 17:11:54 -0300 Subject: [PATCH 080/134] update git attributes --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 616cbc4c5..824297736 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,7 +12,6 @@ *.tsx text *.md text *.mdx text -*.svg text *.yml text *.yaml text *.xml text @@ -30,4 +29,5 @@ Dockerfile text *.jpg binary *.ico binary *.gif binary -*.mp4 binary \ No newline at end of file +*.mp4 binary +*.svg binary \ No newline at end of file From e863f797821482d53921cdf19e40458e14bf53a1 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Thu, 24 Aug 2023 17:15:05 -0300 Subject: [PATCH 081/134] update git attributes --- .gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 824297736..5d66e9c68 100644 --- a/.gitattributes +++ b/.gitattributes @@ -30,4 +30,5 @@ Dockerfile text *.ico binary *.gif binary *.mp4 binary -*.svg binary \ No newline at end of file +*.svg binary +*.csv binary \ No newline at end of file From 1a51cc0848211b8133da1994aaff90b740a40f9f Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 24 Aug 2023 17:32:26 -0300 Subject: [PATCH 082/134] =?UTF-8?q?=F0=9F=93=A6=20feat(api=5Fkey):=20add?= =?UTF-8?q?=20ApiKey=20model=20and=20related=20classes=20for=20database=20?= =?UTF-8?q?operations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 📦 feat(component): add Component model and related classes for database operations 📦 feat(flow): add Flow model and related classes for database operations 📦 feat(token): add Token model for authentication 📦 feat(user): add User model and related classes for database operations 📦 feat(user): add utility functions for user operations --- .../database/models/api_key/__init__.py | 3 ++ .../database/models/{ => api_key}/api_key.py | 0 .../database/models/component/__init__.py | 3 ++ .../models/{ => component}/component.py | 0 .../services/database/models/flow/__init__.py | 3 ++ .../database/models/{ => flow}/flow.py | 3 -- .../database/models/token/__init__.py | 5 ++ .../database/models/{ => token}/token.py | 0 .../services/database/models/user/__init__.py | 8 +++ .../services/database/models/user/user.py | 40 ++++++++++++++ .../models/{user.py => user/utils.py} | 53 ++----------------- 11 files changed, 67 insertions(+), 51 deletions(-) create mode 100644 src/backend/langflow/services/database/models/api_key/__init__.py rename src/backend/langflow/services/database/models/{ => api_key}/api_key.py (100%) create mode 100644 src/backend/langflow/services/database/models/component/__init__.py rename src/backend/langflow/services/database/models/{ => component}/component.py (100%) create mode 100644 src/backend/langflow/services/database/models/flow/__init__.py rename src/backend/langflow/services/database/models/{ => flow}/flow.py (94%) create mode 100644 src/backend/langflow/services/database/models/token/__init__.py rename src/backend/langflow/services/database/models/{ => token}/token.py (100%) create mode 100644 src/backend/langflow/services/database/models/user/__init__.py create mode 100644 src/backend/langflow/services/database/models/user/user.py rename src/backend/langflow/services/database/models/{user.py => user/utils.py} (51%) diff --git a/src/backend/langflow/services/database/models/api_key/__init__.py b/src/backend/langflow/services/database/models/api_key/__init__.py new file mode 100644 index 000000000..c97425ee8 --- /dev/null +++ b/src/backend/langflow/services/database/models/api_key/__init__.py @@ -0,0 +1,3 @@ +from .api_key import ApiKey, ApiKeyCreate, ApiKeyRead + +__all__ = ["ApiKey", "ApiKeyCreate", "ApiKeyRead"] diff --git a/src/backend/langflow/services/database/models/api_key.py b/src/backend/langflow/services/database/models/api_key/api_key.py similarity index 100% rename from src/backend/langflow/services/database/models/api_key.py rename to src/backend/langflow/services/database/models/api_key/api_key.py diff --git a/src/backend/langflow/services/database/models/component/__init__.py b/src/backend/langflow/services/database/models/component/__init__.py new file mode 100644 index 000000000..c787c3e04 --- /dev/null +++ b/src/backend/langflow/services/database/models/component/__init__.py @@ -0,0 +1,3 @@ +from .component import Component, ComponentModel + +__all__ = ["Component", "ComponentModel"] diff --git a/src/backend/langflow/services/database/models/component.py b/src/backend/langflow/services/database/models/component/component.py similarity index 100% rename from src/backend/langflow/services/database/models/component.py rename to src/backend/langflow/services/database/models/component/component.py diff --git a/src/backend/langflow/services/database/models/flow/__init__.py b/src/backend/langflow/services/database/models/flow/__init__.py new file mode 100644 index 000000000..7c7cc0172 --- /dev/null +++ b/src/backend/langflow/services/database/models/flow/__init__.py @@ -0,0 +1,3 @@ +from .flow import Flow, FlowCreate, FlowRead, FlowUpdate + +__all__ = ["Flow", "FlowCreate", "FlowRead", "FlowUpdate"] diff --git a/src/backend/langflow/services/database/models/flow.py b/src/backend/langflow/services/database/models/flow/flow.py similarity index 94% rename from src/backend/langflow/services/database/models/flow.py rename to src/backend/langflow/services/database/models/flow/flow.py index 2bc83f9dc..a05de5791 100644 --- a/src/backend/langflow/services/database/models/flow.py +++ b/src/backend/langflow/services/database/models/flow/flow.py @@ -6,8 +6,6 @@ from sqlmodel import Field, JSON, Column from uuid import UUID, uuid4 from typing import Dict, Optional -# if TYPE_CHECKING: - class FlowBase(SQLModelSerializable): name: str = Field(index=True) @@ -16,7 +14,6 @@ class FlowBase(SQLModelSerializable): @validator("data") def validate_json(v): - # dict_keys(['description', 'name', 'id', 'data']) if not v: return v if not isinstance(v, dict): diff --git a/src/backend/langflow/services/database/models/token/__init__.py b/src/backend/langflow/services/database/models/token/__init__.py new file mode 100644 index 000000000..9b9fa397d --- /dev/null +++ b/src/backend/langflow/services/database/models/token/__init__.py @@ -0,0 +1,5 @@ +from .token import Token + +__all__ = [ + "Token", +] diff --git a/src/backend/langflow/services/database/models/token.py b/src/backend/langflow/services/database/models/token/token.py similarity index 100% rename from src/backend/langflow/services/database/models/token.py rename to src/backend/langflow/services/database/models/token/token.py diff --git a/src/backend/langflow/services/database/models/user/__init__.py b/src/backend/langflow/services/database/models/user/__init__.py new file mode 100644 index 000000000..da9170eb7 --- /dev/null +++ b/src/backend/langflow/services/database/models/user/__init__.py @@ -0,0 +1,8 @@ +from .user import User, UserCreate, UserRead, UserUpdate + +__all__ = [ + "User", + "UserCreate", + "UserRead", + "UserUpdate", +] diff --git a/src/backend/langflow/services/database/models/user/user.py b/src/backend/langflow/services/database/models/user/user.py new file mode 100644 index 000000000..3a4308b42 --- /dev/null +++ b/src/backend/langflow/services/database/models/user/user.py @@ -0,0 +1,40 @@ +from langflow.services.database.models.base import SQLModel, SQLModelSerializable +from sqlmodel import Field + + +from datetime import datetime +from typing import Optional +from uuid import UUID, uuid4 + + +class User(SQLModelSerializable, table=True): + id: UUID = Field(default_factory=uuid4, primary_key=True, unique=True) + username: str = Field(index=True, unique=True) + password: str = Field() + is_active: bool = Field(default=False) + is_superuser: bool = Field(default=False) + create_at: datetime = Field(default_factory=datetime.utcnow) + updated_at: datetime = Field(default_factory=datetime.utcnow) + last_login_at: Optional[datetime] = Field() + + +class UserCreate(SQLModel): + username: str = Field() + password: str = Field() + + +class UserRead(SQLModel): + id: UUID = Field(default_factory=uuid4) + username: str = Field() + is_active: bool = Field() + is_superuser: bool = Field() + create_at: datetime = Field() + updated_at: datetime = Field() + last_login_at: Optional[datetime] = Field() + + +class UserUpdate(SQLModel): + username: Optional[str] = Field() + is_active: Optional[bool] = Field() + is_superuser: Optional[bool] = Field() + last_login_at: Optional[datetime] = Field() diff --git a/src/backend/langflow/services/database/models/user.py b/src/backend/langflow/services/database/models/user/utils.py similarity index 51% rename from src/backend/langflow/services/database/models/user.py rename to src/backend/langflow/services/database/models/user/utils.py index f9a3c80f8..3b600bd9a 100644 --- a/src/backend/langflow/services/database/models/user.py +++ b/src/backend/langflow/services/database/models/user/utils.py @@ -1,53 +1,10 @@ +from datetime import datetime, timezone +from uuid import UUID from fastapi import Depends, HTTPException -from langflow.services.database.models.base import SQLModel, SQLModelSerializable +from langflow.services.database.models.user.user import User, UserUpdate from langflow.services.utils import get_session -from pydantic import BaseModel from sqlalchemy.exc import IntegrityError from sqlalchemy.orm import Session -from sqlmodel import Field - - -from datetime import datetime, timezone -from typing import List, Optional -from uuid import UUID, uuid4 - - -class User(SQLModelSerializable, table=True): - id: UUID = Field(default_factory=uuid4, primary_key=True, unique=True) - username: str = Field(index=True, unique=True) - password: str = Field() - is_active: bool = Field(default=False) - is_superuser: bool = Field(default=False) - create_at: datetime = Field(default_factory=datetime.utcnow) - updated_at: datetime = Field(default_factory=datetime.utcnow) - last_login_at: Optional[datetime] = Field() - - -class UserAddModel(SQLModel): - username: str = Field() - password: str = Field() - - -class UserListModel(SQLModel): - id: UUID = Field(default_factory=uuid4) - username: str = Field() - is_active: bool = Field() - is_superuser: bool = Field() - create_at: datetime = Field() - updated_at: datetime = Field() - last_login_at: Optional[datetime] = Field() - - -class UserPatchModel(SQLModel): - username: Optional[str] = Field() - is_active: Optional[bool] = Field() - is_superuser: Optional[bool] = Field() - last_login_at: Optional[datetime] = Field() - - -class UsersResponse(BaseModel): - total_count: int - users: List[UserListModel] def get_user_by_username(db: Session, username: str) -> User: @@ -61,7 +18,7 @@ def get_user_by_id(db: Session, id: UUID) -> User: def update_user( - user_id: UUID, user: UserPatchModel, db: Session = Depends(get_session) + user_id: UUID, user: UserUpdate, db: Session = Depends(get_session) ) -> User: user_db = get_user_by_username(db, user.username) # type: ignore if user_db and user_db.id != user_id: @@ -90,6 +47,6 @@ def update_user( def update_user_last_login_at(user_id: UUID, db: Session = Depends(get_session)): - user_data = UserPatchModel(last_login_at=datetime.now(timezone.utc)) # type: ignore + user_data = UserUpdate(last_login_at=datetime.now(timezone.utc)) # type: ignore return update_user(user_id, user_data, db) From d9cbf17b1a779f5a05cbf29798edea56e4823aa1 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 24 Aug 2023 17:41:41 -0300 Subject: [PATCH 083/134] =?UTF-8?q?=F0=9F=94=84=20chore(router.py):=20add?= =?UTF-8?q?=20users=5Frouter=20and=20api=5Fkey=5Frouter=20to=20the=20APIRo?= =?UTF-8?q?uter=20to=20include=20the=20new=20routes=20for=20users=20and=20?= =?UTF-8?q?api=20keys=20=F0=9F=94=84=20chore(=5F=5Finit=5F=5F.py):=20add?= =?UTF-8?q?=20users=5Frouter=20and=20api=5Fkey=5Frouter=20to=20the=20=5F?= =?UTF-8?q?=5Fall=5F=5F=20list=20to=20include=20the=20new=20routes=20for?= =?UTF-8?q?=20users=20and=20api=20keys=20=F0=9F=86=95=20feat(api=5Fkey.py)?= =?UTF-8?q?:=20add=20new=20routes=20for=20retrieving,=20creating,=20and=20?= =?UTF-8?q?deleting=20API=20keys=20=F0=9F=86=95=20feat(login.py):=20add=20?= =?UTF-8?q?new=20routes=20for=20user=20login,=20auto=20login,=20and=20toke?= =?UTF-8?q?n=20refresh=20=F0=9F=86=95=20feat(schemas.py):=20add=20new=20sc?= =?UTF-8?q?hemas=20for=20API=20key=20response=20and=20users=20response=20?= =?UTF-8?q?=F0=9F=86=95=20feat(users.py):=20add=20new=20routes=20for=20add?= =?UTF-8?q?ing,=20reading,=20updating,=20and=20deleting=20users=20?= =?UTF-8?q?=F0=9F=97=91=EF=B8=8F=20chore(health.py):=20remove=20health=20r?= =?UTF-8?q?outer=20as=20it=20is=20no=20longer=20needed=20=F0=9F=94=84=20ch?= =?UTF-8?q?ore(utils.py):=20update=20import=20statements=20for=20User=20mo?= =?UTF-8?q?del=20and=20update=5Fuser=5Flast=5Flogin=5Fat=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/router.py | 4 ++++ src/backend/langflow/api/v1/__init__.py | 4 ++++ .../langflow/{routers => api/v1}/api_key.py | 0 .../langflow/{routers => api/v1}/login.py | 0 src/backend/langflow/api/v1/schemas.py | 6 +++++ .../langflow/{routers => api/v1}/users.py | 22 +++++++++---------- src/backend/langflow/routers/health.py | 8 ------- src/backend/langflow/services/auth/utils.py | 4 ++-- 8 files changed, 27 insertions(+), 21 deletions(-) rename src/backend/langflow/{routers => api/v1}/api_key.py (100%) rename src/backend/langflow/{routers => api/v1}/login.py (100%) rename src/backend/langflow/{routers => api/v1}/users.py (88%) delete mode 100644 src/backend/langflow/routers/health.py diff --git a/src/backend/langflow/api/router.py b/src/backend/langflow/api/router.py index ea1938a75..70cce437d 100644 --- a/src/backend/langflow/api/router.py +++ b/src/backend/langflow/api/router.py @@ -6,6 +6,8 @@ from langflow.api.v1 import ( validate_router, flows_router, component_router, + users_router, + api_key_router, ) router = APIRouter( @@ -16,3 +18,5 @@ router.include_router(endpoints_router) router.include_router(validate_router) router.include_router(component_router) router.include_router(flows_router) +router.include_router(users_router) +router.include_router(api_key_router) diff --git a/src/backend/langflow/api/v1/__init__.py b/src/backend/langflow/api/v1/__init__.py index b6e7b36d8..38f1c9148 100644 --- a/src/backend/langflow/api/v1/__init__.py +++ b/src/backend/langflow/api/v1/__init__.py @@ -3,6 +3,8 @@ from langflow.api.v1.validate import router as validate_router from langflow.api.v1.chat import router as chat_router from langflow.api.v1.flows import router as flows_router from langflow.api.v1.components import router as component_router +from langflow.api.v1.users import router as users_router +from langflow.api.v1.api_key import router as api_key_router __all__ = [ "chat_router", @@ -10,4 +12,6 @@ __all__ = [ "component_router", "validate_router", "flows_router", + "users_router", + "api_key_router", ] diff --git a/src/backend/langflow/routers/api_key.py b/src/backend/langflow/api/v1/api_key.py similarity index 100% rename from src/backend/langflow/routers/api_key.py rename to src/backend/langflow/api/v1/api_key.py diff --git a/src/backend/langflow/routers/login.py b/src/backend/langflow/api/v1/login.py similarity index 100% rename from src/backend/langflow/routers/login.py rename to src/backend/langflow/api/v1/login.py diff --git a/src/backend/langflow/api/v1/schemas.py b/src/backend/langflow/api/v1/schemas.py index d188e5c7a..d788469fa 100644 --- a/src/backend/langflow/api/v1/schemas.py +++ b/src/backend/langflow/api/v1/schemas.py @@ -3,6 +3,7 @@ from pathlib import Path from typing import Any, Dict, List, Optional, Union from langflow.services.database.models.api_key import ApiKeyRead from langflow.services.database.models.flow import FlowCreate, FlowRead +from langflow.services.database.models.user import UserRead from pydantic import BaseModel, Field, validator import json @@ -141,3 +142,8 @@ class ApiKeyResponse(BaseModel): total_count: int user_id: str api_keys: List[ApiKeyRead] + + +class UsersResponse(BaseModel): + total_count: int + users: List[UserRead] diff --git a/src/backend/langflow/routers/users.py b/src/backend/langflow/api/v1/users.py similarity index 88% rename from src/backend/langflow/routers/users.py rename to src/backend/langflow/api/v1/users.py index 2a944cb64..33ddc9763 100644 --- a/src/backend/langflow/routers/users.py +++ b/src/backend/langflow/api/v1/users.py @@ -1,10 +1,10 @@ from uuid import UUID +from langflow.api.v1.schemas import UsersResponse from langflow.services.database.models.user import ( User, - UserAddModel, - UserListModel, - UserPatchModel, - UsersResponse, + UserCreate, + UserRead, + UserUpdate, ) from sqlalchemy import func @@ -15,16 +15,16 @@ from fastapi import APIRouter, Depends, HTTPException from langflow.services.utils import get_session from langflow.services.auth.utils import get_current_active_user, get_password_hash -from langflow.services.database.models.user import ( +from langflow.services.database.models.user.utils import ( update_user, ) router = APIRouter(tags=["Login"]) -@router.post("/user", response_model=UserListModel) +@router.post("/user", response_model=UserRead) def add_user( - user: UserAddModel, + user: UserCreate, db: Session = Depends(get_session), ) -> User: """ @@ -44,7 +44,7 @@ def add_user( return new_user -@router.get("/user", response_model=UserListModel) +@router.get("/user", response_model=UserRead) def read_current_user(current_user: User = Depends(get_current_active_user)) -> User: """ Retrieve the current user's data. @@ -70,14 +70,14 @@ def read_all_users( return UsersResponse( total_count=total_count, # type: ignore - users=[UserListModel(**dict(user.User)) for user in users], + users=[UserRead(**dict(user.User)) for user in users], ) -@router.patch("/user/{user_id}", response_model=UserListModel) +@router.patch("/user/{user_id}", response_model=UserRead) def patch_user( user_id: UUID, - user: UserPatchModel, + user: UserUpdate, _: Session = Depends(get_current_active_user), db: Session = Depends(get_session), ) -> User: diff --git a/src/backend/langflow/routers/health.py b/src/backend/langflow/routers/health.py deleted file mode 100644 index 244ef001d..000000000 --- a/src/backend/langflow/routers/health.py +++ /dev/null @@ -1,8 +0,0 @@ -from fastapi import APIRouter - -router = APIRouter() - - -@router.get("/health") -def get_health(): - return {"status": "OK"} diff --git a/src/backend/langflow/services/auth/utils.py b/src/backend/langflow/services/auth/utils.py index f897151e7..aa4bec669 100644 --- a/src/backend/langflow/services/auth/utils.py +++ b/src/backend/langflow/services/auth/utils.py @@ -4,8 +4,8 @@ from jose import JWTError, jwt from typing import Annotated from uuid import UUID from langflow.services.auth.service import AuthManager -from langflow.services.database.models.user import ( - User, +from langflow.services.database.models.user.user import User +from langflow.services.database.models.user.utils import ( get_user_by_id, get_user_by_username, update_user_last_login_at, From 58121cc6ca7b53a69ff2e45cfd45913a1ca955a5 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 24 Aug 2023 17:42:33 -0300 Subject: [PATCH 084/134] =?UTF-8?q?=F0=9F=94=A5=20refactor(main.py):=20rem?= =?UTF-8?q?ove=20unused=20routers=20from=20the=20app=20to=20improve=20code?= =?UTF-8?q?=20cleanliness=20and=20reduce=20unnecessary=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/main.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/backend/langflow/main.py b/src/backend/langflow/main.py index 7045ec99d..a383a2afa 100644 --- a/src/backend/langflow/main.py +++ b/src/backend/langflow/main.py @@ -6,7 +6,7 @@ from fastapi.responses import FileResponse from fastapi.staticfiles import StaticFiles from langflow.api import router -from langflow.routers import api_key, login, users, health + from langflow.interface.utils import setup_llm_caching from langflow.services.database.utils import initialize_database @@ -31,11 +31,6 @@ def create_app(): allow_headers=["*"], ) - app.include_router(login.router) - app.include_router(api_key.router) - app.include_router(users.router) - app.include_router(health.router) - app.include_router(router) app.on_event("startup")(initialize_services) From 41ef2fd2f72cc82d5bd4314704b7cf60b84a1311 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 24 Aug 2023 17:42:53 -0300 Subject: [PATCH 085/134] =?UTF-8?q?=F0=9F=94=A7=20fix(alembic):=20fix=20in?= =?UTF-8?q?dentation=20and=20formatting=20issues=20in=20add=5Fapikey=5Ftab?= =?UTF-8?q?le=20migration=20script=20=E2=9C=A8=20feat(alembic):=20add=20su?= =?UTF-8?q?pport=20for=20creating=20apikey=20and=20user=20tables=20in=20th?= =?UTF-8?q?e=20database=20=F0=9F=94=A5=20chore(alembic):=20remove=20flowst?= =?UTF-8?q?yle=20and=20component=20tables=20from=20the=20database=20schema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../versions/5512e39b4012_add_apikey_table.py | 126 ++++++++++-------- 1 file changed, 71 insertions(+), 55 deletions(-) diff --git a/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py b/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py index 8c8ae75fd..02db82e71 100644 --- a/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py +++ b/src/backend/langflow/alembic/versions/5512e39b4012_add_apikey_table.py @@ -5,6 +5,8 @@ Revises: 0a534bdfd84b Create Date: 2023-08-23 21:05:51.042203 """ + +import contextlib from typing import Sequence, Union from alembic import op @@ -13,72 +15,86 @@ import sqlmodel # revision identifiers, used by Alembic. -revision: str = '5512e39b4012' -down_revision: Union[str, None] = '0a534bdfd84b' +revision: str = "5512e39b4012" +down_revision: Union[str, None] = "0a534bdfd84b" branch_labels: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None def upgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### - op.create_table('apikey', - sa.Column('api_key', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('create_at', sa.DateTime(), nullable=False), - sa.Column('last_used_at', sa.DateTime(), nullable=True), - sa.Column('id', sqlmodel.sql.sqltypes.GUID(), nullable=False), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('id') - ) - op.create_index(op.f('ix_apikey_api_key'), 'apikey', ['api_key'], unique=True) - op.create_table('user', - sa.Column('id', sqlmodel.sql.sqltypes.GUID(), nullable=False), - sa.Column('username', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('password', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('is_active', sa.Boolean(), nullable=False), - sa.Column('is_superuser', sa.Boolean(), nullable=False), - sa.Column('create_at', sa.DateTime(), nullable=False), - sa.Column('updated_at', sa.DateTime(), nullable=False), - sa.Column('last_login_at', sa.DateTime(), nullable=True), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('id') - ) - op.create_index(op.f('ix_user_username'), 'user', ['username'], unique=True) - op.drop_table('flowstyle') - op.drop_index('ix_component_frontend_node_id', table_name='component') - op.drop_index('ix_component_name', table_name='component') - op.drop_table('component') + with contextlib.suppress(sa.exc.OperationalError): + op.create_table( + "apikey", + sa.Column("api_key", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("name", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("create_at", sa.DateTime(), nullable=False), + sa.Column("last_used_at", sa.DateTime(), nullable=True), + sa.Column("id", sqlmodel.sql.sqltypes.GUID(), nullable=False), + sa.PrimaryKeyConstraint("id"), + sa.UniqueConstraint("id"), + ) + op.create_index(op.f("ix_apikey_api_key"), "apikey", ["api_key"], unique=True) + + with contextlib.suppress(sa.exc.OperationalError): + op.create_table( + "user", + sa.Column("id", sqlmodel.sql.sqltypes.GUID(), nullable=False), + sa.Column("username", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("password", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("is_active", sa.Boolean(), nullable=False), + sa.Column("is_superuser", sa.Boolean(), nullable=False), + sa.Column("create_at", sa.DateTime(), nullable=False), + sa.Column("updated_at", sa.DateTime(), nullable=False), + sa.Column("last_login_at", sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint("id"), + sa.UniqueConstraint("id"), + ) + op.create_index(op.f("ix_user_username"), "user", ["username"], unique=True) + with contextlib.suppress(sa.exc.OperationalError): + op.drop_table("flowstyle") + with contextlib.suppress(sa.exc.OperationalError): + op.drop_index("ix_component_frontend_node_id", table_name="component") + op.drop_index("ix_component_name", table_name="component") + op.drop_table("component") # ### end Alembic commands ### def downgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### - op.create_table('component', - sa.Column('id', sa.CHAR(length=32), nullable=False), - sa.Column('frontend_node_id', sa.CHAR(length=32), nullable=False), - sa.Column('name', sa.VARCHAR(), nullable=False), - sa.Column('description', sa.VARCHAR(), nullable=True), - sa.Column('python_code', sa.VARCHAR(), nullable=True), - sa.Column('return_type', sa.VARCHAR(), nullable=True), - sa.Column('is_disabled', sa.BOOLEAN(), nullable=False), - sa.Column('is_read_only', sa.BOOLEAN(), nullable=False), - sa.Column('create_at', sa.DATETIME(), nullable=False), - sa.Column('update_at', sa.DATETIME(), nullable=False), - sa.PrimaryKeyConstraint('id') + op.create_table( + "component", + sa.Column("id", sa.CHAR(length=32), nullable=False), + sa.Column("frontend_node_id", sa.CHAR(length=32), nullable=False), + sa.Column("name", sa.VARCHAR(), nullable=False), + sa.Column("description", sa.VARCHAR(), nullable=True), + sa.Column("python_code", sa.VARCHAR(), nullable=True), + sa.Column("return_type", sa.VARCHAR(), nullable=True), + sa.Column("is_disabled", sa.BOOLEAN(), nullable=False), + sa.Column("is_read_only", sa.BOOLEAN(), nullable=False), + sa.Column("create_at", sa.DATETIME(), nullable=False), + sa.Column("update_at", sa.DATETIME(), nullable=False), + sa.PrimaryKeyConstraint("id"), ) - op.create_index('ix_component_name', 'component', ['name'], unique=False) - op.create_index('ix_component_frontend_node_id', 'component', ['frontend_node_id'], unique=False) - op.create_table('flowstyle', - sa.Column('color', sa.VARCHAR(), nullable=False), - sa.Column('emoji', sa.VARCHAR(), nullable=False), - sa.Column('flow_id', sa.CHAR(length=32), nullable=True), - sa.Column('id', sa.CHAR(length=32), nullable=False), - sa.ForeignKeyConstraint(['flow_id'], ['flow.id'], ), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('id') + op.create_index("ix_component_name", "component", ["name"], unique=False) + op.create_index( + "ix_component_frontend_node_id", "component", ["frontend_node_id"], unique=False ) - op.drop_index(op.f('ix_user_username'), table_name='user') - op.drop_table('user') - op.drop_index(op.f('ix_apikey_api_key'), table_name='apikey') - op.drop_table('apikey') + op.create_table( + "flowstyle", + sa.Column("color", sa.VARCHAR(), nullable=False), + sa.Column("emoji", sa.VARCHAR(), nullable=False), + sa.Column("flow_id", sa.CHAR(length=32), nullable=True), + sa.Column("id", sa.CHAR(length=32), nullable=False), + sa.ForeignKeyConstraint( + ["flow_id"], + ["flow.id"], + ), + sa.PrimaryKeyConstraint("id"), + sa.UniqueConstraint("id"), + ) + op.drop_index(op.f("ix_user_username"), table_name="user") + op.drop_table("user") + op.drop_index(op.f("ix_apikey_api_key"), table_name="apikey") + op.drop_table("apikey") # ### end Alembic commands ### From bf568ad22f906fe0a3a46bc381a44ab5c7179fbb Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Thu, 24 Aug 2023 19:41:23 -0300 Subject: [PATCH 086/134] update attribute --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 5d66e9c68..4b878819c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -31,4 +31,4 @@ Dockerfile text *.gif binary *.mp4 binary *.svg binary -*.csv binary \ No newline at end of file +*.csv binary From cea8acacd8dbec94a90627b53846694864d5d89e Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Thu, 24 Aug 2023 19:42:48 -0300 Subject: [PATCH 087/134] update type to avoid undefined --- src/frontend/src/modals/flowSettingsModal/index.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontend/src/modals/flowSettingsModal/index.tsx b/src/frontend/src/modals/flowSettingsModal/index.tsx index ed91f5dbb..7729f78fe 100644 --- a/src/frontend/src/modals/flowSettingsModal/index.tsx +++ b/src/frontend/src/modals/flowSettingsModal/index.tsx @@ -15,11 +15,11 @@ export default function FlowSettingsModal({ const { flows, tabId, updateFlow, saveFlow } = useContext(TabsContext); const flow = flows.find((f) => f.id === tabId); useEffect(() => { - setName(flow.name); - setDescription(flow.description); - }, [flow.name, flow.description]); - const [name, setName] = useState(flow.name); - const [description, setDescription] = useState(flow.description); + setName(flow!.name); + setDescription(flow!.description); + }, [flow!.name, flow!.description]); + const [name, setName] = useState(flow!.name); + const [description, setDescription] = useState(flow!.description); const [invalidName, setInvalidName] = useState(false); function handleClick(): void { From 9b3e4f27a54d4c2242f8f542a9eff3bba39ed9d1 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Thu, 24 Aug 2023 19:50:17 -0300 Subject: [PATCH 088/134] fix(tabsContext.tsx): handle error message properly when saving changes in the tabs provider The error handling in the tabs provider has been improved to display a more meaningful error message when there is an error while saving changes. Instead of directly assigning the error to the `setErrorData` state variable, the error message is now wrapped in an object with a title and a list of error messages. This change ensures that the error message is displayed consistently and provides better context to the user. --- src/frontend/src/contexts/tabsContext.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/contexts/tabsContext.tsx b/src/frontend/src/contexts/tabsContext.tsx index 5c48e6e5b..2e3334f5e 100644 --- a/src/frontend/src/contexts/tabsContext.tsx +++ b/src/frontend/src/contexts/tabsContext.tsx @@ -30,6 +30,7 @@ import { import { getRandomDescription, getRandomName } from "../utils/utils"; import { alertContext } from "./alertContext"; import { typesContext } from "./typesContext"; +import { AxiosError } from "axios"; const uid = new ShortUniqueId({ length: 5 }); @@ -602,7 +603,7 @@ export function TabsProvider({ children }: { children: ReactNode }) { }); } } catch (err) { - setErrorData(err as errorsVarType); + setErrorData({title: "Error while saving changes",list:[(err as AxiosError).message]}); } } From 6b82b730cd3d90eda40a773bf3f5d0efc524b47e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:09:37 -0300 Subject: [PATCH 089/134] =?UTF-8?q?=F0=9F=94=A5=20refactor(auth):=20remove?= =?UTF-8?q?=20unused=20code=20and=20dependencies=20in=20auth=20module=20?= =?UTF-8?q?=F0=9F=94=A5=20refactor(routers):=20remove=20unused=20code=20an?= =?UTF-8?q?d=20dependencies=20in=20routers=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/auth/__init__.py | 0 src/backend/langflow/auth/auth.py | 219 ----------------------- src/backend/langflow/routers/__init__.py | 0 3 files changed, 219 deletions(-) delete mode 100644 src/backend/langflow/auth/__init__.py delete mode 100644 src/backend/langflow/auth/auth.py delete mode 100644 src/backend/langflow/routers/__init__.py diff --git a/src/backend/langflow/auth/__init__.py b/src/backend/langflow/auth/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/backend/langflow/auth/auth.py b/src/backend/langflow/auth/auth.py deleted file mode 100644 index f274a9523..000000000 --- a/src/backend/langflow/auth/auth.py +++ /dev/null @@ -1,219 +0,0 @@ -from uuid import UUID -from typing import Annotated -from jose import JWTError, jwt -from langflow.services.database.models.user import ( - User, - get_user_by_id, - get_user_by_username, -) -from sqlalchemy.orm import Session -from passlib.context import CryptContext -from fastapi.security import OAuth2PasswordBearer -from fastapi import Depends, HTTPException, status -from datetime import datetime, timedelta, timezone - -from langflow.services.utils import get_settings_manager, get_session - -from langflow.services.database.models.user import ( - update_user_last_login_at, -) - - -pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") -oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login") - - -async def get_current_user( - token: Annotated[str, Depends(oauth2_scheme)], db: Session = Depends(get_session) -) -> User: - settings_manager = get_settings_manager() - - credentials_exception = HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail="Could not validate credentials", - headers={"WWW-Authenticate": "Bearer"}, - ) - - try: - payload = jwt.decode( - token, - settings_manager.auth_settings.SECRET_KEY, - algorithms=[settings_manager.auth_settings.ALGORITHM], - ) - user_id: UUID = payload.get("sub") # type: ignore - token_type: str = payload.get("type") # type: ignore - - if user_id is None or token_type: - raise credentials_exception - except JWTError as e: - raise credentials_exception from e - - user = get_user_by_id(db, user_id) # type: ignore - if user is None: - raise credentials_exception - return user - - -async def get_current_active_user( - current_user: Annotated[User, Depends(get_current_user)] -): - if not current_user.is_active: - raise HTTPException(status_code=400, detail="Inactive user") - return current_user - - -def verify_password(plain_password, hashed_password): - return pwd_context.verify(plain_password, hashed_password) - - -def get_password_hash(password): - return pwd_context.hash(password) - - -def create_token(data: dict, expires_delta: timedelta): - settings_manager = get_settings_manager() - - to_encode = data.copy() - expire = datetime.now(timezone.utc) + expires_delta - to_encode["exp"] = expire - - return jwt.encode( - to_encode, - settings_manager.auth_settings.SECRET_KEY, - algorithm=settings_manager.auth_settings.ALGORITHM, - ) - - -def create_super_user(db: Session = Depends(get_session)) -> User: - settings_manager = get_settings_manager() - - super_user = get_user_by_username( - db, settings_manager.auth_settings.FIRST_SUPERUSER - ) - - if not super_user: - super_user = User( - username=settings_manager.auth_settings.FIRST_SUPERUSER, - password=get_password_hash( - settings_manager.auth_settings.FIRST_SUPERUSER_PASSWORD - ), - is_superuser=True, - is_active=True, - last_login_at=None, - ) - - db.add(super_user) - db.commit() - db.refresh(super_user) - - return super_user - - -def create_user_longterm_token(db: Session = Depends(get_session)) -> dict: - super_user = create_super_user(db) - - access_token_expires_longterm = timedelta(days=365) - access_token = create_token( - data={"sub": str(super_user.id)}, - expires_delta=access_token_expires_longterm, - ) - - # Update: last_login_at - update_user_last_login_at(super_user.id, db) - - return { - "access_token": access_token, - "refresh_token": None, - "token_type": "bearer", - } - - -def create_user_api_key(user_id: UUID) -> dict: - access_token = create_token( - data={"sub": str(user_id), "role": "api_key"}, - expires_delta=timedelta(days=365 * 2), - ) - - return {"api_key": access_token} - - -def get_user_id_from_token(token: str) -> UUID: - try: - user_id = jwt.get_unverified_claims(token)["sub"] - return UUID(user_id) - except (KeyError, JWTError, ValueError): - return UUID(int=0) - - -def create_user_tokens( - user_id: UUID, db: Session = Depends(get_session), update_last_login: bool = False -) -> dict: - settings_manager = get_settings_manager() - - access_token_expires = timedelta( - minutes=settings_manager.auth_settings.ACCESS_TOKEN_EXPIRE_MINUTES - ) - access_token = create_token( - data={"sub": str(user_id)}, - expires_delta=access_token_expires, - ) - - refresh_token_expires = timedelta( - minutes=settings_manager.auth_settings.REFRESH_TOKEN_EXPIRE_MINUTES - ) - refresh_token = create_token( - data={"sub": str(user_id), "type": "rf"}, - expires_delta=refresh_token_expires, - ) - - # Update: last_login_at - if update_last_login: - update_user_last_login_at(user_id, db) - - return { - "access_token": access_token, - "refresh_token": refresh_token, - "token_type": "bearer", - } - - -def create_refresh_token(refresh_token: str, db: Session = Depends(get_session)): - settings_manager = get_settings_manager() - - try: - payload = jwt.decode( - refresh_token, - settings_manager.auth_settings.SECRET_KEY, - algorithms=[settings_manager.auth_settings.ALGORITHM], - ) - user_id: UUID = payload.get("sub") # type: ignore - token_type: str = payload.get("type") # type: ignore - - if user_id is None or token_type is None: - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid refresh token" - ) - - return create_user_tokens(user_id, db) - - except JWTError as e: - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail="Invalid refresh token", - ) from e - - -def authenticate_user( - username: str, password: str, db: Session = Depends(get_session) -) -> User | None: - user = get_user_by_username(db, username) - - if not user: - return None - - if not user.is_active: - if not user.last_login_at: - raise HTTPException(status_code=400, detail="Waiting for approval") - raise HTTPException(status_code=400, detail="Inactive user") - - return user if verify_password(password, user.password) else None diff --git a/src/backend/langflow/routers/__init__.py b/src/backend/langflow/routers/__init__.py deleted file mode 100644 index e69de29bb..000000000 From 43b2d62661204f385248f8faeaf0eb85a453f7f7 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:10:19 -0300 Subject: [PATCH 090/134] =?UTF-8?q?=F0=9F=94=80=20chore(router.py):=20add?= =?UTF-8?q?=20login=5Frouter=20to=20the=20APIRouter=20to=20include=20login?= =?UTF-8?q?=20functionality=20=F0=9F=94=80=20chore(=5F=5Finit=5F=5F.py):?= =?UTF-8?q?=20import=20and=20include=20login=5Frouter=20in=20the=20APIRout?= =?UTF-8?q?er=20to=20enable=20login=20functionality=20=F0=9F=94=80=20chore?= =?UTF-8?q?(login.py):=20add=20tags=20to=20the=20login=20router=20to=20cat?= =?UTF-8?q?egorize=20it=20as=20"Login"=20in=20the=20API=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/router.py | 2 ++ src/backend/langflow/api/v1/__init__.py | 2 ++ src/backend/langflow/api/v1/login.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/api/router.py b/src/backend/langflow/api/router.py index 70cce437d..dbaf20e75 100644 --- a/src/backend/langflow/api/router.py +++ b/src/backend/langflow/api/router.py @@ -8,6 +8,7 @@ from langflow.api.v1 import ( component_router, users_router, api_key_router, + login_router, ) router = APIRouter( @@ -20,3 +21,4 @@ router.include_router(component_router) router.include_router(flows_router) router.include_router(users_router) router.include_router(api_key_router) +router.include_router(login_router) diff --git a/src/backend/langflow/api/v1/__init__.py b/src/backend/langflow/api/v1/__init__.py index 38f1c9148..9335a4607 100644 --- a/src/backend/langflow/api/v1/__init__.py +++ b/src/backend/langflow/api/v1/__init__.py @@ -5,6 +5,7 @@ from langflow.api.v1.flows import router as flows_router from langflow.api.v1.components import router as component_router from langflow.api.v1.users import router as users_router from langflow.api.v1.api_key import router as api_key_router +from langflow.api.v1.login import router as login_router __all__ = [ "chat_router", @@ -14,4 +15,5 @@ __all__ = [ "flows_router", "users_router", "api_key_router", + "login_router", ] diff --git a/src/backend/langflow/api/v1/login.py b/src/backend/langflow/api/v1/login.py index b559b0a23..600e373df 100644 --- a/src/backend/langflow/api/v1/login.py +++ b/src/backend/langflow/api/v1/login.py @@ -13,7 +13,7 @@ from langflow.services.auth.utils import ( from langflow.services.utils import get_settings_manager -router = APIRouter() +router = APIRouter(tags=["Login"]) @router.post("/login", response_model=Token) From e4cbc0a07ffdc5613dc33b11b571c003a54823bb Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:10:57 -0300 Subject: [PATCH 091/134] =?UTF-8?q?=F0=9F=90=9B=20fix(users.py):=20change?= =?UTF-8?q?=20router=20tag=20from=20"Login"=20to=20"Users"=20for=20better?= =?UTF-8?q?=20categorization=20=E2=9C=A8=20feat(users.py):=20add=20status?= =?UTF-8?q?=20code=20201=20to=20the=20response=20of=20the=20add=5Fuser=20e?= =?UTF-8?q?ndpoint=20to=20indicate=20successful=20creation=20of=20a=20new?= =?UTF-8?q?=20user=20=F0=9F=90=9B=20fix(users.py):=20update=20the=20usage?= =?UTF-8?q?=20of=20UserCreate=20model=20to=20create=20a=20new=20User=20ins?= =?UTF-8?q?tance=20using=20User.from=5Form(user)=20for=20better=20compatib?= =?UTF-8?q?ility=20=E2=9C=A8=20feat(users.py):=20add=20current=5Fuser=20pa?= =?UTF-8?q?rameter=20to=20the=20read=5Fcurrent=5Fuser=20endpoint=20to=20en?= =?UTF-8?q?force=20authentication=20and=20authorization=20=E2=9C=A8=20feat?= =?UTF-8?q?(users.py):=20add=20current=5Fuser=20parameter=20to=20the=20rea?= =?UTF-8?q?d=5Fall=5Fusers=20endpoint=20to=20enforce=20authentication=20an?= =?UTF-8?q?d=20authorization=20=E2=9C=A8=20feat(users.py):=20add=20current?= =?UTF-8?q?=5Fuser=20parameter=20to=20the=20delete=5Fuser=20endpoint=20to?= =?UTF-8?q?=20enforce=20authentication=20and=20authorization.=20Also,=20ad?= =?UTF-8?q?d=20validation=20checks=20to=20prevent=20deleting=20own=20user?= =?UTF-8?q?=20account=20and=20unauthorized=20deletion=20of=20users.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/users.py | 29 +++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/backend/langflow/api/v1/users.py b/src/backend/langflow/api/v1/users.py index 33ddc9763..5a464b5f2 100644 --- a/src/backend/langflow/api/v1/users.py +++ b/src/backend/langflow/api/v1/users.py @@ -14,15 +14,19 @@ from sqlmodel import Session, select from fastapi import APIRouter, Depends, HTTPException from langflow.services.utils import get_session -from langflow.services.auth.utils import get_current_active_user, get_password_hash +from langflow.services.auth.utils import ( + get_current_active_superuser, + get_current_active_user, + get_password_hash, +) from langflow.services.database.models.user.utils import ( update_user, ) -router = APIRouter(tags=["Login"]) +router = APIRouter(tags=["Users"]) -@router.post("/user", response_model=UserRead) +@router.post("/user", response_model=UserRead, status_code=201) def add_user( user: UserCreate, db: Session = Depends(get_session), @@ -30,7 +34,7 @@ def add_user( """ Add a new user to the database. """ - new_user = User(**user.dict()) + new_user = User.from_orm(user) try: new_user.password = get_password_hash(user.password) @@ -45,7 +49,9 @@ def add_user( @router.get("/user", response_model=UserRead) -def read_current_user(current_user: User = Depends(get_current_active_user)) -> User: +def read_current_user( + current_user: User = Depends(get_current_active_user), +) -> User: """ Retrieve the current user's data. """ @@ -56,7 +62,7 @@ def read_current_user(current_user: User = Depends(get_current_active_user)) -> def read_all_users( skip: int = 0, limit: int = 10, - _: Session = Depends(get_current_active_user), + current_user: Session = Depends(get_current_active_superuser), db: Session = Depends(get_session), ) -> UsersResponse: """ @@ -90,12 +96,21 @@ def patch_user( @router.delete("/user/{user_id}") def delete_user( user_id: UUID, - _: Session = Depends(get_current_active_user), + current_user: Session = Depends(get_current_active_superuser), db: Session = Depends(get_session), ) -> dict: """ Delete a user from the database. """ + if current_user.id == user_id: + raise HTTPException( + status_code=400, detail="You can't delete your own user account" + ) + elif not current_user.is_superuser: + raise HTTPException( + status_code=403, detail="You don't have the permission to delete this user" + ) + user_db = db.query(User).filter(User.id == user_id).first() if not user_db: raise HTTPException(status_code=404, detail="User not found") From 4517f8ad5c3b5f5cbcee99bdc4ee19b68f9e5f23 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:11:24 -0300 Subject: [PATCH 092/134] =?UTF-8?q?=F0=9F=94=A7=20fix(service.py):=20add?= =?UTF-8?q?=20request=20parameter=20to=20run=5Foauth2=5Fscheme=20method=20?= =?UTF-8?q?in=20AuthManager=20class=20to=20handle=20FastAPI=20request=20ob?= =?UTF-8?q?ject=20=F0=9F=94=A7=20fix(utils.py):=20add=20request=20paramete?= =?UTF-8?q?r=20to=20auth=5Fscheme=5Fdependency=20function=20to=20handle=20?= =?UTF-8?q?FastAPI=20request=20object=20=F0=9F=94=A7=20fix(utils.py):=20ch?= =?UTF-8?q?ange=20get=5Fcurrent=5Factive=5Fuser=20function=20to=20synchron?= =?UTF-8?q?ous=20and=20remove=20async=20keyword=20=E2=9C=A8=20feat(utils.p?= =?UTF-8?q?y):=20add=20get=5Fcurrent=5Factive=5Fsuperuser=20function=20to?= =?UTF-8?q?=20check=20if=20the=20current=20user=20is=20an=20active=20super?= =?UTF-8?q?user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/auth/service.py | 5 ++-- src/backend/langflow/services/auth/utils.py | 26 +++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/backend/langflow/services/auth/service.py b/src/backend/langflow/services/auth/service.py index 57c586c94..c80b984bb 100644 --- a/src/backend/langflow/services/auth/service.py +++ b/src/backend/langflow/services/auth/service.py @@ -1,3 +1,4 @@ +from fastapi import Request from langflow.services.base import Service from typing import TYPE_CHECKING @@ -13,5 +14,5 @@ class AuthManager(Service): # We need to define a function that can be passed to the Depends() function. # This function will be called by FastAPI to run oauth2_scheme - def run_oauth2_scheme(self, *args, **kwargs): - return self.settings_manager.auth_settings.oauth2_scheme(*args, **kwargs) + def run_oauth2_scheme(self, request: Request): + return self.settings_manager.auth_settings.oauth2_scheme(request=request) diff --git a/src/backend/langflow/services/auth/utils.py b/src/backend/langflow/services/auth/utils.py index aa4bec669..ae6065beb 100644 --- a/src/backend/langflow/services/auth/utils.py +++ b/src/backend/langflow/services/auth/utils.py @@ -1,5 +1,5 @@ from datetime import datetime, timedelta, timezone -from fastapi import Depends, HTTPException, status +from fastapi import Depends, HTTPException, Request, status from jose import JWTError, jwt from typing import Annotated from uuid import UUID @@ -14,12 +14,12 @@ from langflow.services.utils import get_session, get_settings_manager from sqlalchemy.orm import Session -def auth_scheme_dependency(*args, **kwargs): +def auth_scheme_dependency(request: Request): settings_manager = ( get_settings_manager() ) # Assuming get_settings_manager is defined - return AuthManager(settings_manager).run_oauth2_scheme(*args, **kwargs) + return AuthManager(settings_manager).run_oauth2_scheme(request) async def get_current_user( @@ -35,7 +35,7 @@ async def get_current_user( ) try: payload = jwt.decode( - token, + await token, settings_manager.auth_settings.SECRET_KEY, algorithms=[settings_manager.auth_settings.ALGORITHM], ) @@ -48,19 +48,29 @@ async def get_current_user( raise credentials_exception from e user = get_user_by_id(db, user_id) # type: ignore - if user is None: + if user is None or not user.is_active: raise credentials_exception return user -async def get_current_active_user( - current_user: Annotated[User, Depends(get_current_user)] -): +def get_current_active_user(current_user: Annotated[User, Depends(get_current_user)]): if not current_user.is_active: raise HTTPException(status_code=400, detail="Inactive user") return current_user +def get_current_active_superuser( + current_user: Annotated[User, Depends(get_current_user)] +) -> User: + if not current_user.is_active: + raise HTTPException(status_code=401, detail="Inactive user") + if not current_user.is_superuser: + raise HTTPException( + status_code=400, detail="The user doesn't have enough privileges" + ) + return current_user + + def verify_password(plain_password, hashed_password): settings_manager = get_settings_manager() return settings_manager.auth_settings.pwd_context.verify( From 92a7ae6be71c7cf6718db20232f75a55e0083a2e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:16:04 -0300 Subject: [PATCH 093/134] =?UTF-8?q?=F0=9F=90=9B=20fix(utils.py):=20remove?= =?UTF-8?q?=20unnecessary=20type=20casting=20in=20get=5Fuser=5Fby=5Fuserna?= =?UTF-8?q?me=20and=20get=5Fuser=5Fby=5Fid=20functions=20=F0=9F=90=9B=20fi?= =?UTF-8?q?x(utils.py):=20fix=20update=5Fuser=20function=20to=20correctly?= =?UTF-8?q?=20update=20user=20attributes=20and=20handle=20username=20confl?= =?UTF-8?q?icts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/database/models/user/utils.py | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/backend/langflow/services/database/models/user/utils.py b/src/backend/langflow/services/database/models/user/utils.py index 3b600bd9a..514ca4e82 100644 --- a/src/backend/langflow/services/database/models/user/utils.py +++ b/src/backend/langflow/services/database/models/user/utils.py @@ -4,41 +4,41 @@ from fastapi import Depends, HTTPException from langflow.services.database.models.user.user import User, UserUpdate from langflow.services.utils import get_session from sqlalchemy.exc import IntegrityError -from sqlalchemy.orm import Session +from sqlmodel import Session + + +from sqlalchemy.orm.attributes import flag_modified def get_user_by_username(db: Session, username: str) -> User: - db_user = db.query(User).filter(User.username == username).first() - return User.from_orm(db_user) if db_user else None # type: ignore + return db.query(User).filter(User.username == username).first() def get_user_by_id(db: Session, id: UUID) -> User: - db_user = db.query(User).filter(User.id == id).first() - return User.from_orm(db_user) if db_user else None # type: ignore + return db.query(User).filter(User.id == id).first() def update_user( user_id: UUID, user: UserUpdate, db: Session = Depends(get_session) ) -> User: - user_db = get_user_by_username(db, user.username) # type: ignore - if user_db and user_db.id != user_id: - raise HTTPException(status_code=409, detail="Username already exists") - user_db = get_user_by_id(db, user_id) if not user_db: raise HTTPException(status_code=404, detail="User not found") + user_db_by_username = get_user_by_username(db, user.username) # type: ignore + if user_db_by_username and user_db_by_username.id != user_id: + raise HTTPException(status_code=409, detail="Username already exists") + + user_data = user.dict(exclude_unset=True) + for attr, value in user_data.items(): + if hasattr(user_db, attr) and value is not None: + setattr(user_db, attr, value) + + user_db.updated_at = datetime.now(timezone.utc) + flag_modified(user_db, "updated_at") + try: - user_data = user.dict(exclude_unset=True) - for key, value in user_data.items(): - setattr(user_db, key, value) - - user_db.updated_at = datetime.now(timezone.utc) - user_db = db.merge(user_db) db.commit() - if db.identity_key(instance=user_db) is not None: - db.refresh(user_db) - except IntegrityError as e: db.rollback() raise HTTPException(status_code=400, detail=str(e)) from e From 7e3d329df9f0ed8b71794b6b3cccd1bf92f8ec27 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:17:25 -0300 Subject: [PATCH 094/134] =?UTF-8?q?=F0=9F=94=A7=20chore(auth.py):=20add=20?= =?UTF-8?q?API=5FV1=5FSTR=20constant=20to=20improve=20code=20readability?= =?UTF-8?q?=20and=20maintainability=20=F0=9F=90=9B=20fix(auth.py):=20updat?= =?UTF-8?q?e=20tokenUrl=20in=20oauth2=5Fscheme=20to=20use=20API=5FV1=5FSTR?= =?UTF-8?q?=20constant=20for=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/settings/auth.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/services/settings/auth.py b/src/backend/langflow/services/settings/auth.py index a00ebf31e..2aa4e17bc 100644 --- a/src/backend/langflow/services/settings/auth.py +++ b/src/backend/langflow/services/settings/auth.py @@ -18,6 +18,7 @@ class AuthSettings(BaseSettings): str ] = "b82818e0ad4ff76615c5721ee21004b07d84cd9b87ba4d9cb42374da134b841a" API_KEY_ALGORITHM: str = "HS256" + API_V1_STR: str = "/api/v1" # If AUTO_LOGIN = True # > The application does not request login and logs in automatically as a super user. @@ -26,7 +27,7 @@ class AuthSettings(BaseSettings): FIRST_SUPERUSER_PASSWORD: str = "langflow" pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") - oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login") + oauth2_scheme = OAuth2PasswordBearer(tokenUrl=f"{API_V1_STR}/login") class Config: validate_assignment = True From 7b897906b9dcf660dc0ccbb7677d9d76b4639d73 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:17:36 -0300 Subject: [PATCH 095/134] =?UTF-8?q?=E2=9C=A8=20feat(test=5Flogin.py):=20ad?= =?UTF-8?q?d=20tests=20for=20login=20functionality?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🐛 fix(test_login.py): fix typo in test_login_unsuccessful_wrong_username test 🐛 fix(test_login.py): fix typo in test_login_unsuccessful_wrong_password test --- tests/test_login.py | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 tests/test_login.py diff --git a/tests/test_login.py b/tests/test_login.py new file mode 100644 index 000000000..07abb35ab --- /dev/null +++ b/tests/test_login.py @@ -0,0 +1,47 @@ +import pytest +from langflow.services.database.models.user import User +from langflow.services.auth.utils import get_password_hash + + +@pytest.fixture +def test_user(): + return User( + username="testuser", + password=get_password_hash( + "testpassword" + ), # Assuming password needs to be hashed + is_active=True, + is_superuser=False, + ) + + +def test_login_successful(client, test_user, session): + # Adding the test user to the database + session.add(test_user) + session.commit() + + response = client.post( + "api/v1/login", data={"username": "testuser", "password": "testpassword"} + ) + assert response.status_code == 200 + assert "access_token" in response.json() + + +def test_login_unsuccessful_wrong_username(client): + response = client.post( + "api/v1/login", data={"username": "wrongusername", "password": "testpassword"} + ) + assert response.status_code == 401 + assert response.json()["detail"] == "Incorrect username or password" + + +def test_login_unsuccessful_wrong_password(client, test_user, session): + # Adding the test user to the database + session.add(test_user) + session.commit() + + response = client.post( + "api/v1/login", data={"username": "testuser", "password": "wrongpassword"} + ) + assert response.status_code == 401 + assert response.json()["detail"] == "Incorrect username or password" From 8411922a07d8376c704062e03ed93a04f006d860 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:17:46 -0300 Subject: [PATCH 096/134] =?UTF-8?q?=E2=9C=A8=20feat(test=5Fuser.py):=20add?= =?UTF-8?q?=20tests=20for=20user-related=20functionalities=20=F0=9F=90=9B?= =?UTF-8?q?=20fix(test=5Fuser.py):=20fix=20typo=20in=20test=5Fuser=5Fwaiti?= =?UTF-8?q?ng=5Ffor=5Fapproval=20function=20name=20=F0=9F=90=9B=20fix(test?= =?UTF-8?q?=5Fuser.py):=20fix=20typo=20in=20test=5Fdeactivated=5Fuser=5Fca?= =?UTF-8?q?nnot=5Faccess=20function=20name=20=F0=9F=90=9B=20fix(test=5Fuse?= =?UTF-8?q?r.py):=20fix=20typo=20in=20test=5Fdata=5Fconsistency=5Fafter=5F?= =?UTF-8?q?update=20function=20name=20=F0=9F=90=9B=20fix(test=5Fuser.py):?= =?UTF-8?q?=20fix=20typo=20in=20test=5Fdata=5Fconsistency=5Fafter=5Fdelete?= =?UTF-8?q?=20function=20name=20=F0=9F=90=9B=20fix(test=5Fuser.py):=20fix?= =?UTF-8?q?=20typo=20in=20test=5Finactive=5Fuser=20function=20name=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(test=5Fuser.py):=20fix=20typo=20in=20test=5F?= =?UTF-8?q?normal=5Fuser=5Fcant=5Fread=5Fall=5Fusers=20function=20name=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(test=5Fuser.py):=20fix=20typo=20in=20test=5F?= =?UTF-8?q?patch=5Fuser=5Fwrong=5Fid=20function=20name=20=F0=9F=90=9B=20fi?= =?UTF-8?q?x(test=5Fuser.py):=20fix=20typo=20in=20test=5Fdelete=5Fuser=5Fw?= =?UTF-8?q?rong=5Fid=20function=20name=20=F0=9F=90=9B=20fix(test=5Fuser.py?= =?UTF-8?q?):=20fix=20typo=20in=20test=5Fnormal=5Fuser=5Fcant=5Fdelete=5Fu?= =?UTF-8?q?ser=20function=20name=20=E2=9C=A8=20feat(test=5Fuser.py):=20add?= =?UTF-8?q?=20test=5Fadd=5Fsuper=5Fuser=5Ffor=5Ftesting=5Fpurposes=5Fdelet?= =?UTF-8?q?e=5Fme=5Fbefore=5Fmerge=5Finto=5Fdev=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_user.py | 248 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 tests/test_user.py diff --git a/tests/test_user.py b/tests/test_user.py new file mode 100644 index 000000000..f8d4ff788 --- /dev/null +++ b/tests/test_user.py @@ -0,0 +1,248 @@ +from datetime import datetime +from langflow.services.auth.utils import create_super_user, get_password_hash + +from langflow.services.database.models.user.user import User +from langflow.services.utils import get_settings_manager +import pytest +from langflow.services.database.models.user import UserCreate, UserUpdate + + +@pytest.fixture +def test_user(client): + user_data = UserCreate( + username="testuser", + password="testpassword", + ) + response = client.post("/api/v1/user", json=user_data.dict()) + return response.json() + + +@pytest.fixture(scope="function") +def active_user(session): + user = User( + username="activeuser", + password=get_password_hash( + "testpassword" + ), # Assuming password needs to be hashed + is_active=True, + is_superuser=False, + ) + session.add(user) + session.commit() + return user + + +@pytest.fixture +def logged_in_headers(client, active_user): + login_data = {"username": active_user.username, "password": "testpassword"} + response = client.post("/api/v1/login", data=login_data) + assert response.status_code == 200 + tokens = response.json() + a_token = tokens["access_token"] + return {"Authorization": f"Bearer {a_token}"} + + +@pytest.fixture +def super_user(client, session): + return create_super_user(session) + + +@pytest.fixture +def super_user_headers(client, super_user): + settings_manager = get_settings_manager() + auth_settings = settings_manager.auth_settings + login_data = { + "username": auth_settings.FIRST_SUPERUSER, + "password": auth_settings.FIRST_SUPERUSER_PASSWORD, + } + response = client.post("/api/v1/login", data=login_data) + assert response.status_code == 200 + tokens = response.json() + a_token = tokens["access_token"] + return {"Authorization": f"Bearer {a_token}"} + + +@pytest.fixture +def deactivated_user(session): + user = User( + username="deactivateduser", + password=get_password_hash("testpassword"), + is_active=False, + is_superuser=False, + last_login_at=datetime.now(), + ) + session.add(user) + session.commit() + return user + + +def test_user_waiting_for_approval(client, session): + # Create a user that is not active and has never logged in + user = User( + username="waitingforapproval", + password=get_password_hash("testpassword"), + is_active=False, + last_login_at=None, + ) + session.add(user) + session.commit() + + login_data = {"username": "waitingforapproval", "password": "testpassword"} + response = client.post("/api/v1/login", data=login_data) + assert response.status_code == 400 + assert response.json()["detail"] == "Waiting for approval" + + +def test_deactivated_user_cannot_login(client, deactivated_user): + login_data = {"username": deactivated_user.username, "password": "testpassword"} + response = client.post("/api/v1/login", data=login_data) + assert response.status_code == 400, response.json() + assert response.json()["detail"] == "Inactive user" + + +def test_deactivated_user_cannot_access(client, deactivated_user, logged_in_headers): + # Assuming the headers for deactivated_user + response = client.get("/api/v1/users", headers=logged_in_headers) + assert response.status_code == 400, response.json() + assert response.json()["detail"] == "The user doesn't have enough privileges" + + +def test_data_consistency_after_update(client, active_user, logged_in_headers): + user_id = active_user.id + update_data = UserUpdate(username="newname") + + response = client.patch( + f"/api/v1/user/{user_id}", json=update_data.dict(), headers=logged_in_headers + ) + assert response.status_code == 200 + + # Fetch the updated user from the database + response = client.get("/api/v1/user", headers=logged_in_headers) + assert response.json()["username"] == "newname", response.json() + + +def test_data_consistency_after_delete(client, test_user, super_user_headers): + user_id = test_user["id"] + response = client.delete(f"/api/v1/user/{user_id}", headers=super_user_headers) + assert response.status_code == 200 + + # Attempt to fetch the deleted user from the database + response = client.get("/api/v1/users", headers=super_user_headers) + assert response.status_code == 200 + assert all(user["id"] != user_id for user in response.json()["users"]) + + +def test_inactive_user(client, session): + # Create a user that is not active and has a last_login_at value + user = User( + username="inactiveuser", + password=get_password_hash("testpassword"), + is_active=False, + last_login_at="2023-01-01T00:00:00", # Set to a valid datetime string + ) + session.add(user) + session.commit() + + login_data = {"username": "inactiveuser", "password": "testpassword"} + response = client.post("/api/v1/login", data=login_data) + assert response.status_code == 400 + assert response.json()["detail"] == "Inactive user" + + +def test_add_user(client, test_user): + assert test_user["username"] == "testuser" + + +# This is not used in the Frontend at the moment +# def test_read_current_user(client: TestClient, active_user): +# # First we need to login to get the access token +# login_data = {"username": "testuser", "password": "testpassword"} +# response = client.post("/api/v1/login", data=login_data) +# assert response.status_code == 200 + +# headers = {"Authorization": f"Bearer {response.json()['access_token']}"} + +# response = client.get("/api/v1/user", headers=headers) +# assert response.status_code == 200, response.json() +# assert response.json()["username"] == "testuser" + + +def test_read_all_users(client, super_user_headers): + response = client.get("/api/v1/users", headers=super_user_headers) + assert response.status_code == 200, response.json() + assert isinstance(response.json()["users"], list) + + +def test_normal_user_cant_read_all_users(client, logged_in_headers): + response = client.get("/api/v1/users", headers=logged_in_headers) + assert response.status_code == 400, response.json() + assert response.json() == {"detail": "The user doesn't have enough privileges"} + + +def test_patch_user(client, active_user, logged_in_headers): + user_id = active_user.id + update_data = UserUpdate( + username="newname", + ) + + response = client.patch( + f"/api/v1/user/{user_id}", json=update_data.dict(), headers=logged_in_headers + ) + assert response.status_code == 200, response.json() + + +def test_patch_user_wrong_id(client, active_user, logged_in_headers): + user_id = "wrong_id" + update_data = UserUpdate( + username="newname", + ) + + response = client.patch( + f"/api/v1/user/{user_id}", json=update_data.dict(), headers=logged_in_headers + ) + assert response.status_code == 422, response.json() + assert response.json() == { + "detail": [ + { + "loc": ["path", "user_id"], + "msg": "value is not a valid uuid", + "type": "type_error.uuid", + } + ] + } + + +def test_delete_user(client, test_user, super_user_headers): + user_id = test_user["id"] + response = client.delete(f"/api/v1/user/{user_id}", headers=super_user_headers) + assert response.status_code == 200 + assert response.json() == {"detail": "User deleted"} + + +def test_delete_user_wrong_id(client, test_user, super_user_headers): + user_id = "wrong_id" + response = client.delete(f"/api/v1/user/{user_id}", headers=super_user_headers) + assert response.status_code == 422 + assert response.json() == { + "detail": [ + { + "loc": ["path", "user_id"], + "msg": "value is not a valid uuid", + "type": "type_error.uuid", + } + ] + } + + +def test_normal_user_cant_delete_user(client, test_user, logged_in_headers): + user_id = test_user["id"] + response = client.delete(f"/api/v1/user/{user_id}", headers=logged_in_headers) + assert response.status_code == 400 + assert response.json() == {"detail": "The user doesn't have enough privileges"} + + +# If you still want to test the superuser endpoint +def test_add_super_user_for_testing_purposes_delete_me_before_merge_into_dev(client): + response = client.post("/api/v1/super_user") + assert response.status_code == 200 + assert response.json()["username"] == "superuser" From 81816baadae57a70c10772397ec9848a6fd2d277 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:24:01 -0300 Subject: [PATCH 097/134] =?UTF-8?q?=F0=9F=94=A7=20fix(login.py):=20update?= =?UTF-8?q?=20import=20statement=20from=20sqlalchemy.orm=20to=20sqlmodel.S?= =?UTF-8?q?ession=20for=20Session=20class=20=F0=9F=94=A7=20fix(users.py):?= =?UTF-8?q?=20update=20type=20annotation=20for=20current=5Fuser=20paramete?= =?UTF-8?q?r=20from=20Session=20to=20User=20=F0=9F=94=A7=20fix(utils.py):?= =?UTF-8?q?=20update=20import=20statement=20from=20sqlalchemy.orm=20to=20s?= =?UTF-8?q?qlmodel.Session=20=F0=9F=94=A7=20fix(utils.py):=20update=20type?= =?UTF-8?q?=20annotation=20for=20token=20parameter=20from=20Annotated=20to?= =?UTF-8?q?=20Union[Coroutine,=20str]=20=F0=9F=94=A7=20fix(utils.py):=20up?= =?UTF-8?q?date=20type=20annotation=20for=20get=5Fuser=5Fby=5Fusername=20f?= =?UTF-8?q?unction=20return=20type=20from=20User=20to=20Union[User,=20None?= =?UTF-8?q?]=20=F0=9F=94=A7=20fix(utils.py):=20update=20type=20annotation?= =?UTF-8?q?=20for=20get=5Fuser=5Fby=5Fid=20function=20return=20type=20from?= =?UTF-8?q?=20User=20to=20Union[User,=20None]=20=F0=9F=94=A7=20fix(manager?= =?UTF-8?q?.py):=20update=20type=20annotation=20for=20dependencies=20param?= =?UTF-8?q?eter=20in=20register=5Ffactory=20method=20from=20List=20to=20Op?= =?UTF-8?q?tional[List]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/login.py | 2 +- src/backend/langflow/api/v1/users.py | 2 +- src/backend/langflow/services/auth/utils.py | 10 +++++++--- .../langflow/services/database/models/user/utils.py | 5 +++-- src/backend/langflow/services/manager.py | 6 ++++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/backend/langflow/api/v1/login.py b/src/backend/langflow/api/v1/login.py index 600e373df..a11167a40 100644 --- a/src/backend/langflow/api/v1/login.py +++ b/src/backend/langflow/api/v1/login.py @@ -1,4 +1,4 @@ -from sqlalchemy.orm import Session +from sqlmodel import Session from fastapi import APIRouter, Depends, HTTPException, status from fastapi.security import OAuth2PasswordRequestForm diff --git a/src/backend/langflow/api/v1/users.py b/src/backend/langflow/api/v1/users.py index 5a464b5f2..e41551e8c 100644 --- a/src/backend/langflow/api/v1/users.py +++ b/src/backend/langflow/api/v1/users.py @@ -96,7 +96,7 @@ def patch_user( @router.delete("/user/{user_id}") def delete_user( user_id: UUID, - current_user: Session = Depends(get_current_active_superuser), + current_user: User = Depends(get_current_active_superuser), db: Session = Depends(get_session), ) -> dict: """ diff --git a/src/backend/langflow/services/auth/utils.py b/src/backend/langflow/services/auth/utils.py index ae6065beb..540b012b1 100644 --- a/src/backend/langflow/services/auth/utils.py +++ b/src/backend/langflow/services/auth/utils.py @@ -1,7 +1,7 @@ from datetime import datetime, timedelta, timezone from fastapi import Depends, HTTPException, Request, status from jose import JWTError, jwt -from typing import Annotated +from typing import Annotated, Coroutine from uuid import UUID from langflow.services.auth.service import AuthManager from langflow.services.database.models.user.user import User @@ -11,7 +11,7 @@ from langflow.services.database.models.user.utils import ( update_user_last_login_at, ) from langflow.services.utils import get_session, get_settings_manager -from sqlalchemy.orm import Session +from sqlmodel import Session def auth_scheme_dependency(request: Request): @@ -33,9 +33,13 @@ async def get_current_user( detail="Could not validate credentials", headers={"WWW-Authenticate": "Bearer"}, ) + + if isinstance(token, Coroutine): + token = await token + try: payload = jwt.decode( - await token, + token, settings_manager.auth_settings.SECRET_KEY, algorithms=[settings_manager.auth_settings.ALGORITHM], ) diff --git a/src/backend/langflow/services/database/models/user/utils.py b/src/backend/langflow/services/database/models/user/utils.py index 514ca4e82..3dc02a499 100644 --- a/src/backend/langflow/services/database/models/user/utils.py +++ b/src/backend/langflow/services/database/models/user/utils.py @@ -1,4 +1,5 @@ from datetime import datetime, timezone +from typing import Union from uuid import UUID from fastapi import Depends, HTTPException from langflow.services.database.models.user.user import User, UserUpdate @@ -10,11 +11,11 @@ from sqlmodel import Session from sqlalchemy.orm.attributes import flag_modified -def get_user_by_username(db: Session, username: str) -> User: +def get_user_by_username(db: Session, username: str) -> Union[User, None]: return db.query(User).filter(User.username == username).first() -def get_user_by_id(db: Session, id: UUID) -> User: +def get_user_by_id(db: Session, id: UUID) -> Union[User, None]: return db.query(User).filter(User.id == id).first() diff --git a/src/backend/langflow/services/manager.py b/src/backend/langflow/services/manager.py index 1592e7612..e9895adab 100644 --- a/src/backend/langflow/services/manager.py +++ b/src/backend/langflow/services/manager.py @@ -1,5 +1,5 @@ from langflow.services.schema import ServiceType -from typing import TYPE_CHECKING, List +from typing import TYPE_CHECKING, List, Optional if TYPE_CHECKING: from langflow.services.factory import ServiceFactory @@ -16,7 +16,9 @@ class ServiceManager: self.dependencies = {} def register_factory( - self, service_factory: "ServiceFactory", dependencies: List[ServiceType] = None + self, + service_factory: "ServiceFactory", + dependencies: Optional[List[ServiceType]] = None, ): """ Registers a new factory with dependencies. From fc93e4ced0235b9506837d0922590fe2cb057a85 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:24:33 -0300 Subject: [PATCH 098/134] =?UTF-8?q?=F0=9F=94=80=20chore(test=5Fdatabase.py?= =?UTF-8?q?):=20update=20import=20statement=20for=20Session=20from=20sqlal?= =?UTF-8?q?chemy.orm=20to=20sqlmodel=20to=20match=20the=20library=20being?= =?UTF-8?q?=20used?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_database.py b/tests/test_database.py index 52a5daa4c..996d4faa5 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -2,7 +2,7 @@ import json import pytest from uuid import UUID, uuid4 -from sqlalchemy.orm import Session +from sqlmodel import Session from fastapi.testclient import TestClient From 8d1e1b871044260c8b734a144888d210458afb06 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 10:25:28 -0300 Subject: [PATCH 099/134] =?UTF-8?q?=F0=9F=94=92=20chore(api=5Fkey.py):=20u?= =?UTF-8?q?pdate=20hardcoded=20API=20key=20value=20to=20improve=20security?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔒 chore(api_key.py): update hardcoded API key value to improve security by removing the actual key from the code and adding a placeholder comment --- src/backend/langflow/api/v1/api_key.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/langflow/api/v1/api_key.py b/src/backend/langflow/api/v1/api_key.py index 9fa6acec5..56deb3059 100644 --- a/src/backend/langflow/api/v1/api_key.py +++ b/src/backend/langflow/api/v1/api_key.py @@ -40,7 +40,7 @@ def create_api_key(user_id: str): return { "user_id": user_id, "name": "my api-key 01", - "api_key": "lf-eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI1YTBmODM1ZS0yMTQxLTQ2YWItYmQ4NS0yMWEzMjQ1MTE2ZDAiLCJleHAiOjE2OTIyMTUwMTN9.c_s0ZPRtjSI9yUrhi8ACIwyXf0feRLYfaeIZEbRVKQg", + "api_key": "lf-eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI1YTBmODM1ZS0yMTQxLTQ2YWItYmQ4NS0yMWEzMjQ1MTE2ZDAiLCJleHAiOjE2OTIyMTUwMTN9.c_s0ZPRtjSI9yUrhi8ACIwyXf0feRLYfaeIZEbRVKQg", # noqa } From eb02220aadc6e4c0ab20923c206a8c42395cb205 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:02:32 -0300 Subject: [PATCH 100/134] =?UTF-8?q?=E2=9C=A8=20feat(api=5Fkey.py):=20add?= =?UTF-8?q?=20GET=20and=20POST=20routes=20for=20retrieving=20and=20creatin?= =?UTF-8?q?g=20API=20keys=20=F0=9F=90=9B=20fix(api=5Fkey.py):=20fix=20dele?= =?UTF-8?q?te=5Fapi=5Fkey=20route=20to=20use=20correct=20dependencies=20an?= =?UTF-8?q?d=20handle=20exceptions=20properly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/api_key.py | 87 ++++++++++++++------------ 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/src/backend/langflow/api/v1/api_key.py b/src/backend/langflow/api/v1/api_key.py index 56deb3059..e7b2dd163 100644 --- a/src/backend/langflow/api/v1/api_key.py +++ b/src/backend/langflow/api/v1/api_key.py @@ -1,49 +1,58 @@ -from fastapi import APIRouter +from fastapi import APIRouter, HTTPException, Depends +from langflow.api.v1.schemas import ApiKeysResponse, CreateApiKeyRequest +from langflow.services.auth.utils import get_current_active_user +from langflow.services.database.models.api_key.api_key import UnmaskedApiKeyRead + +# Assuming you have these methods in your service layer +from langflow.services.database.models.api_key.crud import ( + get_api_keys, + create_api_key, + delete_api_key, +) +from langflow.services.database.models.user.user import User +from langflow.services.utils import get_session +from sqlmodel import Session router = APIRouter(tags=["APIKey"]) -@router.get("/api_key/{user_id}") -def get_api_key(user_id: str): - return { - "total_count": 3, - "user_id": user_id, - "api_keys": [ - { - "id": "4425707e-cce4-4d1b-a54e-bd2632064657", - "api_key": "lf-...abcd", - "name": "my api_key name - 01", - "created_at": "2023-08-15T19:28:40.019613", - "last_used_at": "2023-08-16T18:38:20.875210", - }, - { - "id": "6fb7282b-9f2e-4efe-9bda-0c3d8f899473", - "api_key": "lf-...abcd", - "name": "my api_key name - 02", - "created_at": "2023-08-15T19:41:30.077942", - "last_used_at": "2023-08-15T19:45:32.067899", - }, - { - "id": "c55f3b32-4920-42b6-a5cd-698b4251806e", - "api_key": "lf-...abcd", - "name": "my api_key name - 03", - "created_at": "2023-08-15T20:29:40.577808", - "last_used_at": "2023-08-15T20:29:40.577816", - }, - ], - } +@router.get("/api_key", response_model=ApiKeysResponse) +def get_api_keys_route( + db: Session = Depends(get_session), + current_user: User = Depends(get_current_active_user), +): + try: + user_id = current_user.id + keys = get_api_keys(db, user_id) + + result = {"total_count": len(keys), "user_id": user_id, "api_keys": keys} + return ApiKeysResponse(**result) + except Exception as e: + raise HTTPException(status_code=400, detail=str(e)) -@router.post("/api_key/{user_id}") -def create_api_key(user_id: str): - return { - "user_id": user_id, - "name": "my api-key 01", - "api_key": "lf-eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI1YTBmODM1ZS0yMTQxLTQ2YWItYmQ4NS0yMWEzMjQ1MTE2ZDAiLCJleHAiOjE2OTIyMTUwMTN9.c_s0ZPRtjSI9yUrhi8ACIwyXf0feRLYfaeIZEbRVKQg", # noqa - } +@router.post("/api_key", response_model=UnmaskedApiKeyRead) +def create_api_key_route( + req: CreateApiKeyRequest, + current_user: User = Depends(get_current_active_user), + db: Session = Depends(get_session), +): + try: + user_id = current_user.id + return create_api_key(db, req, user_id=user_id) + except Exception as e: + raise HTTPException(status_code=400, detail=str(e)) from e @router.delete("/api_key/{api_key_id}") -def delete_api_key(api_key_id: str): - return {"detail": "API Key deleted"} +def delete_api_key_route( + api_key_id: str, + current_user=Depends(get_current_active_user), + db: Session = Depends(get_session), +): + try: + delete_api_key(db, api_key_id) + return {"detail": "API Key deleted"} + except Exception as e: + raise HTTPException(status_code=400, detail=str(e)) From edd58705e4c4962c9d5cc200a99cd771827cb79e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:03:03 -0300 Subject: [PATCH 101/134] =?UTF-8?q?=F0=9F=94=A8=20refactor(schemas.py):=20?= =?UTF-8?q?update=20import=20statement=20for=20ApiKeyRead=20to=20reflect?= =?UTF-8?q?=20new=20file=20structure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔨 refactor(schemas.py): update import statement for ApiKeyRead to reflect --- src/backend/langflow/api/v1/schemas.py | 27 +++++++++++++++------ src/backend/langflow/api/v1/users.py | 2 +- src/backend/langflow/services/auth/utils.py | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/backend/langflow/api/v1/schemas.py b/src/backend/langflow/api/v1/schemas.py index d788469fa..3c138610c 100644 --- a/src/backend/langflow/api/v1/schemas.py +++ b/src/backend/langflow/api/v1/schemas.py @@ -1,7 +1,8 @@ from enum import Enum from pathlib import Path from typing import Any, Dict, List, Optional, Union -from langflow.services.database.models.api_key import ApiKeyRead +from uuid import UUID +from langflow.services.database.models.api_key.api_key import ApiKeyRead from langflow.services.database.models.flow import FlowCreate, FlowRead from langflow.services.database.models.user import UserRead from pydantic import BaseModel, Field, validator @@ -138,12 +139,24 @@ class ComponentListRead(BaseModel): flows: List[FlowRead] -class ApiKeyResponse(BaseModel): - total_count: int - user_id: str - api_keys: List[ApiKeyRead] - - class UsersResponse(BaseModel): total_count: int users: List[UserRead] + + +class ApiKeyResponse(BaseModel): + id: str + api_key: str + name: str + created_at: str + last_used_at: str + + +class ApiKeysResponse(BaseModel): + total_count: int + user_id: UUID + api_keys: List[ApiKeyRead] + + +class CreateApiKeyRequest(BaseModel): + name: str diff --git a/src/backend/langflow/api/v1/users.py b/src/backend/langflow/api/v1/users.py index e41551e8c..140ee773f 100644 --- a/src/backend/langflow/api/v1/users.py +++ b/src/backend/langflow/api/v1/users.py @@ -19,7 +19,7 @@ from langflow.services.auth.utils import ( get_current_active_user, get_password_hash, ) -from langflow.services.database.models.user.utils import ( +from langflow.services.database.models.user.crud import ( update_user, ) diff --git a/src/backend/langflow/services/auth/utils.py b/src/backend/langflow/services/auth/utils.py index 540b012b1..8cc67d216 100644 --- a/src/backend/langflow/services/auth/utils.py +++ b/src/backend/langflow/services/auth/utils.py @@ -5,7 +5,7 @@ from typing import Annotated, Coroutine from uuid import UUID from langflow.services.auth.service import AuthManager from langflow.services.database.models.user.user import User -from langflow.services.database.models.user.utils import ( +from langflow.services.database.models.user.crud import ( get_user_by_id, get_user_by_username, update_user_last_login_at, From 82fbeace068a09a83e1c8d02f958a1e40643c39b Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:03:51 -0300 Subject: [PATCH 102/134] =?UTF-8?q?=F0=9F=94=80=20chore(api=5Fkey):=20upda?= =?UTF-8?q?te=20import=20and=20export=20names=20in=20=5F=5Finit=5F=5F.py?= =?UTF-8?q?=20for=20better=20clarity=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔀 chore(api_key): add UnmaskedApiKeyRead model to represent an unmasked API key 🔀 chore(api_key): add user relationship to ApiKey model for easier access to associated user 🔀 chore(api_key): add user_id field to ApiKeyBase and ApiKeyCreate models for easier user association 🔀 chore(api_key): add mask_api_key validator to ApiKeyRead model to mask the API key for security reasons --- .../database/models/api_key/__init__.py | 4 +-- .../database/models/api_key/api_key.py | 28 ++++++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/backend/langflow/services/database/models/api_key/__init__.py b/src/backend/langflow/services/database/models/api_key/__init__.py index c97425ee8..fbb8265b9 100644 --- a/src/backend/langflow/services/database/models/api_key/__init__.py +++ b/src/backend/langflow/services/database/models/api_key/__init__.py @@ -1,3 +1,3 @@ -from .api_key import ApiKey, ApiKeyCreate, ApiKeyRead +from .api_key import ApiKey, ApiKeyCreate, UnmaskedApiKeyRead, ApiKeyRead -__all__ = ["ApiKey", "ApiKeyCreate", "ApiKeyRead"] +__all__ = ["ApiKey", "ApiKeyCreate", "UnmaskedApiKeyRead", "ApiKeyRead"] diff --git a/src/backend/langflow/services/database/models/api_key/api_key.py b/src/backend/langflow/services/database/models/api_key/api_key.py index 784b25229..1006b1c0f 100644 --- a/src/backend/langflow/services/database/models/api_key/api_key.py +++ b/src/backend/langflow/services/database/models/api_key/api_key.py @@ -1,24 +1,44 @@ -from sqlmodel import Field +from pydantic import validator +from sqlmodel import Field, Relationship from uuid import UUID, uuid4 -from typing import Optional +from typing import Optional, TYPE_CHECKING from datetime import datetime from langflow.services.database.models.base import SQLModelSerializable +if TYPE_CHECKING: + from langflow.services.database.models.user import User + class ApiKeyBase(SQLModelSerializable): api_key: str = Field(index=True, unique=True) name: Optional[str] = Field(index=True) - create_at: datetime = Field(default_factory=datetime.utcnow) + created_at: datetime = Field(default_factory=datetime.utcnow) last_used_at: Optional[datetime] = Field(default=None) + user_id: UUID = Field() class ApiKey(ApiKeyBase, table=True): id: UUID = Field(default_factory=uuid4, primary_key=True, unique=True) + # User relationship + user_id: UUID = Field(index=True, foreign_key="user.id") + user: "User" = Relationship(back_populates="api_keys") class ApiKeyCreate(ApiKeyBase): - pass + api_key: Optional[str] = None + user_id: Optional[UUID] = None + + +class UnmaskedApiKeyRead(ApiKeyBase): + id: UUID class ApiKeyRead(ApiKeyBase): id: UUID + api_key: Optional[str] = None + user_id: Optional[UUID] = None + + @validator("api_key", always=True) + def mask_api_key(cls, v): + # This validator will always run, and will mask the API key + return f"{'*' * 8}{v[-4:]}" From e42686738ce21d5ad850196aa34a78dee0841f1d Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:04:20 -0300 Subject: [PATCH 103/134] =?UTF-8?q?=F0=9F=93=A6=20chore(api=5Fkey/crud.py)?= =?UTF-8?q?:=20add=20CRUD=20functions=20for=20managing=20API=20keys=20in?= =?UTF-8?q?=20the=20database?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit adds the following functions to the `api_key/crud.py` file: - `get_api_keys`: Retrieves a list of API keys associated with a specific user ID from the database. - `create_api_key`: Generates a random API key, hashes it, and creates a new `ApiKey` object in the database. - `delete_api_key`: Deletes an API key from the database based on its ID. These functions provide the necessary functionality for managing API keys in the application's database. --- .../services/database/models/api_key/crud.py | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/backend/langflow/services/database/models/api_key/crud.py diff --git a/src/backend/langflow/services/database/models/api_key/crud.py b/src/backend/langflow/services/database/models/api_key/crud.py new file mode 100644 index 000000000..933e7c2b3 --- /dev/null +++ b/src/backend/langflow/services/database/models/api_key/crud.py @@ -0,0 +1,44 @@ +import secrets +from uuid import UUID +from typing import List +from langflow.services.auth.utils import get_password_hash +from sqlmodel import Session, select +from langflow.services.database.models.api_key import ( + ApiKey, + ApiKeyCreate, + UnmaskedApiKeyRead, + ApiKeyRead, +) + + +def get_api_keys(session: Session, user_id: str) -> List[UnmaskedApiKeyRead]: + query = select(ApiKey).where(ApiKey.user_id == user_id) + api_keys = session.exec(query).all() + return [ApiKeyRead.from_orm(api_key) for api_key in api_keys] + + +def create_api_key( + session: Session, api_key_create: ApiKeyCreate, user_id: str +) -> UnmaskedApiKeyRead: + # Generate a random API key with 32 bytes of randomness + generated_api_key = secrets.token_urlsafe(32) + + # hash the API key + hashed_api_key = get_password_hash(generated_api_key) + # Use the generated key to create the ApiKey object + api_key = ApiKey(api_key=hashed_api_key, **api_key_create.dict(), user_id=user_id) + + session.add(api_key) + session.commit() + session.refresh(api_key) + unmasked = UnmaskedApiKeyRead.from_orm(api_key) + unmasked.api_key = generated_api_key + return unmasked + + +def delete_api_key(session: Session, api_key_id: UUID) -> None: + api_key = session.get(ApiKey, api_key_id) + if api_key is None: + raise ValueError("API Key not found") + session.delete(api_key) + session.commit() From 7783f4532ea6efb75fdd082aa6455ecf3633e23a Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:04:51 -0300 Subject: [PATCH 104/134] =?UTF-8?q?=F0=9F=93=A6=20chore(user/crud.py):=20a?= =?UTF-8?q?dd=20CRUD=20operations=20for=20User=20model=20in=20database=20?= =?UTF-8?q?=F0=9F=94=92=20fix(user/crud.py):=20add=20validation=20to=20pre?= =?UTF-8?q?vent=20duplicate=20usernames=20during=20user=20update=20?= =?UTF-8?q?=F0=9F=94=84=20refactor(user/crud.py):=20update=20user=20attrib?= =?UTF-8?q?utes=20and=20last=5Flogin=5Fat=20timestamp=20during=20user=20up?= =?UTF-8?q?date=20=F0=9F=90=9B=20fix(user/crud.py):=20handle=20IntegrityEr?= =?UTF-8?q?ror=20during=20user=20update=20and=20rollback=20transaction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/database/models/user/crud.py | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/backend/langflow/services/database/models/user/crud.py diff --git a/src/backend/langflow/services/database/models/user/crud.py b/src/backend/langflow/services/database/models/user/crud.py new file mode 100644 index 000000000..3dc02a499 --- /dev/null +++ b/src/backend/langflow/services/database/models/user/crud.py @@ -0,0 +1,53 @@ +from datetime import datetime, timezone +from typing import Union +from uuid import UUID +from fastapi import Depends, HTTPException +from langflow.services.database.models.user.user import User, UserUpdate +from langflow.services.utils import get_session +from sqlalchemy.exc import IntegrityError +from sqlmodel import Session + + +from sqlalchemy.orm.attributes import flag_modified + + +def get_user_by_username(db: Session, username: str) -> Union[User, None]: + return db.query(User).filter(User.username == username).first() + + +def get_user_by_id(db: Session, id: UUID) -> Union[User, None]: + return db.query(User).filter(User.id == id).first() + + +def update_user( + user_id: UUID, user: UserUpdate, db: Session = Depends(get_session) +) -> User: + user_db = get_user_by_id(db, user_id) + if not user_db: + raise HTTPException(status_code=404, detail="User not found") + + user_db_by_username = get_user_by_username(db, user.username) # type: ignore + if user_db_by_username and user_db_by_username.id != user_id: + raise HTTPException(status_code=409, detail="Username already exists") + + user_data = user.dict(exclude_unset=True) + for attr, value in user_data.items(): + if hasattr(user_db, attr) and value is not None: + setattr(user_db, attr, value) + + user_db.updated_at = datetime.now(timezone.utc) + flag_modified(user_db, "updated_at") + + try: + db.commit() + except IntegrityError as e: + db.rollback() + raise HTTPException(status_code=400, detail=str(e)) from e + + return user_db + + +def update_user_last_login_at(user_id: UUID, db: Session = Depends(get_session)): + user_data = UserUpdate(last_login_at=datetime.now(timezone.utc)) # type: ignore + + return update_user(user_id, user_data, db) From ba081e81b68f7a1f76a8664c96a21fa0836e25e2 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:05:20 -0300 Subject: [PATCH 105/134] =?UTF-8?q?=F0=9F=94=80=20chore(user.py):=20add=20?= =?UTF-8?q?type=20hinting=20for=20ApiKey=20import=20to=20improve=20code=20?= =?UTF-8?q?readability=20=F0=9F=94=80=20chore(user.py):=20add=20relationsh?= =?UTF-8?q?ip=20between=20User=20and=20ApiKey=20models=20to=20establish=20?= =?UTF-8?q?a=20one-to-many=20relationship?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../langflow/services/database/models/user/user.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/services/database/models/user/user.py b/src/backend/langflow/services/database/models/user/user.py index 3a4308b42..b6c27c2dc 100644 --- a/src/backend/langflow/services/database/models/user/user.py +++ b/src/backend/langflow/services/database/models/user/user.py @@ -1,11 +1,14 @@ from langflow.services.database.models.base import SQLModel, SQLModelSerializable -from sqlmodel import Field +from sqlmodel import Field, Relationship from datetime import datetime -from typing import Optional +from typing import Optional, TYPE_CHECKING from uuid import UUID, uuid4 +if TYPE_CHECKING: + from langflow.services.database.models.api_key import ApiKey + class User(SQLModelSerializable, table=True): id: UUID = Field(default_factory=uuid4, primary_key=True, unique=True) @@ -16,6 +19,7 @@ class User(SQLModelSerializable, table=True): create_at: datetime = Field(default_factory=datetime.utcnow) updated_at: datetime = Field(default_factory=datetime.utcnow) last_login_at: Optional[datetime] = Field() + api_keys: list["ApiKey"] = Relationship(back_populates="user") class UserCreate(SQLModel): From 950b9d179bb6994f9df951ed2070795a033e2bf5 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:05:54 -0300 Subject: [PATCH 106/134] =?UTF-8?q?=F0=9F=94=A5=20refactor(user/utils.py):?= =?UTF-8?q?=20remove=20unused=20code=20and=20imports=20from=20user/utils.p?= =?UTF-8?q?y=20module=20=E2=9C=A8=20feat(test=5Fapi=5Fkey.py):=20add=20tes?= =?UTF-8?q?ts=20for=20API=20key=20creation,=20retrieval,=20and=20deletion?= =?UTF-8?q?=20=E2=9C=A8=20feat(test=5Fuser.py):=20remove=20unused=20fixtur?= =?UTF-8?q?es=20and=20imports=20from=20test=5Fuser.py=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/database/models/user/utils.py | 53 ------------------- tests/conftest.py | 37 +++++++++++++ tests/test_api_key.py | 50 +++++++++++++++++ tests/test_user.py | 37 +------------ 4 files changed, 88 insertions(+), 89 deletions(-) delete mode 100644 src/backend/langflow/services/database/models/user/utils.py create mode 100644 tests/test_api_key.py diff --git a/src/backend/langflow/services/database/models/user/utils.py b/src/backend/langflow/services/database/models/user/utils.py deleted file mode 100644 index 3dc02a499..000000000 --- a/src/backend/langflow/services/database/models/user/utils.py +++ /dev/null @@ -1,53 +0,0 @@ -from datetime import datetime, timezone -from typing import Union -from uuid import UUID -from fastapi import Depends, HTTPException -from langflow.services.database.models.user.user import User, UserUpdate -from langflow.services.utils import get_session -from sqlalchemy.exc import IntegrityError -from sqlmodel import Session - - -from sqlalchemy.orm.attributes import flag_modified - - -def get_user_by_username(db: Session, username: str) -> Union[User, None]: - return db.query(User).filter(User.username == username).first() - - -def get_user_by_id(db: Session, id: UUID) -> Union[User, None]: - return db.query(User).filter(User.id == id).first() - - -def update_user( - user_id: UUID, user: UserUpdate, db: Session = Depends(get_session) -) -> User: - user_db = get_user_by_id(db, user_id) - if not user_db: - raise HTTPException(status_code=404, detail="User not found") - - user_db_by_username = get_user_by_username(db, user.username) # type: ignore - if user_db_by_username and user_db_by_username.id != user_id: - raise HTTPException(status_code=409, detail="Username already exists") - - user_data = user.dict(exclude_unset=True) - for attr, value in user_data.items(): - if hasattr(user_db, attr) and value is not None: - setattr(user_db, attr, value) - - user_db.updated_at = datetime.now(timezone.utc) - flag_modified(user_db, "updated_at") - - try: - db.commit() - except IntegrityError as e: - db.rollback() - raise HTTPException(status_code=400, detail=str(e)) from e - - return user_db - - -def update_user_last_login_at(user_id: UUID, db: Session = Depends(get_session)): - user_data = UserUpdate(last_login_at=datetime.now(timezone.utc)) # type: ignore - - return update_user(user_id, user_data, db) diff --git a/tests/conftest.py b/tests/conftest.py index e90d03d0a..9abe89d49 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,6 +5,8 @@ from typing import AsyncGenerator, TYPE_CHECKING from langflow.api.v1.flows import get_session from langflow.graph.graph.base import Graph +from langflow.services.auth.utils import get_password_hash +from langflow.services.database.models.user.user import User, UserCreate import pytest from fastapi.testclient import TestClient from httpx import AsyncClient @@ -155,3 +157,38 @@ def session_getter_fixture(client): @pytest.fixture def runner(): return CliRunner() + + +@pytest.fixture +def test_user(client): + user_data = UserCreate( + username="testuser", + password="testpassword", + ) + response = client.post("/api/v1/user", json=user_data.dict()) + return response.json() + + +@pytest.fixture(scope="function") +def active_user(session): + user = User( + username="activeuser", + password=get_password_hash( + "testpassword" + ), # Assuming password needs to be hashed + is_active=True, + is_superuser=False, + ) + session.add(user) + session.commit() + return user + + +@pytest.fixture +def logged_in_headers(client, active_user): + login_data = {"username": active_user.username, "password": "testpassword"} + response = client.post("/api/v1/login", data=login_data) + assert response.status_code == 200 + tokens = response.json() + a_token = tokens["access_token"] + return {"Authorization": f"Bearer {a_token}"} diff --git a/tests/test_api_key.py b/tests/test_api_key.py new file mode 100644 index 000000000..43b91fa43 --- /dev/null +++ b/tests/test_api_key.py @@ -0,0 +1,50 @@ +import pytest +from langflow.services.database.models.api_key import ApiKeyCreate + + +@pytest.fixture +def api_key(client, logged_in_headers, active_user): + api_key = ApiKeyCreate(name="test-api-key") + + response = client.post( + "api/v1/api_key", data=api_key.json(), headers=logged_in_headers + ) + assert response.status_code == 200, response.text + return response.json() + + +def test_get_api_keys(client, logged_in_headers, api_key): + response = client.get("api/v1/api_key", headers=logged_in_headers) + assert response.status_code == 200, response.text + data = response.json() + assert "total_count" in data + assert "user_id" in data + assert "api_keys" in data + assert any("test-api-key" in api_key["name"] for api_key in data["api_keys"]) + # assert all api keys in data["api_keys"] are masked + assert all("**" in api_key["api_key"] for api_key in data["api_keys"]) + # Add more assertions as needed based on the expected data structure and content + + +def test_create_api_key(client, logged_in_headers): + api_key_name = "test-api-key" + response = client.post( + "api/v1/api_key", json={"name": api_key_name}, headers=logged_in_headers + ) + assert response.status_code == 200 + data = response.json() + assert "name" in data and data["name"] == api_key_name + assert "api_key" in data + # When creating the API key is returned which is + # the only time the API key is unmasked + assert "**" not in data["api_key"] + + +def test_delete_api_key(client, logged_in_headers, active_user, api_key): + # Assuming a function to create a test API key, returning the key ID + api_key_id = api_key["id"] + response = client.delete(f"api/v1/api_key/{api_key_id}", headers=logged_in_headers) + assert response.status_code == 200 + data = response.json() + assert data["detail"] == "API Key deleted" + # Optionally, add a follow-up check to ensure that the key is actually removed from the database diff --git a/tests/test_user.py b/tests/test_user.py index f8d4ff788..d734e4d61 100644 --- a/tests/test_user.py +++ b/tests/test_user.py @@ -4,42 +4,7 @@ from langflow.services.auth.utils import create_super_user, get_password_hash from langflow.services.database.models.user.user import User from langflow.services.utils import get_settings_manager import pytest -from langflow.services.database.models.user import UserCreate, UserUpdate - - -@pytest.fixture -def test_user(client): - user_data = UserCreate( - username="testuser", - password="testpassword", - ) - response = client.post("/api/v1/user", json=user_data.dict()) - return response.json() - - -@pytest.fixture(scope="function") -def active_user(session): - user = User( - username="activeuser", - password=get_password_hash( - "testpassword" - ), # Assuming password needs to be hashed - is_active=True, - is_superuser=False, - ) - session.add(user) - session.commit() - return user - - -@pytest.fixture -def logged_in_headers(client, active_user): - login_data = {"username": active_user.username, "password": "testpassword"} - response = client.post("/api/v1/login", data=login_data) - assert response.status_code == 200 - tokens = response.json() - a_token = tokens["access_token"] - return {"Authorization": f"Bearer {a_token}"} +from langflow.services.database.models.user import UserUpdate @pytest.fixture From a4aeff6d7966d07f7cca11bcc55b03090da51d38 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:21:14 -0300 Subject: [PATCH 107/134] =?UTF-8?q?=F0=9F=94=A7=20fix(api=5Fkey.py):=20imp?= =?UTF-8?q?ort=20missing=20dependencies=20and=20fix=20type=20annotations?= =?UTF-8?q?=20in=20api=5Fkey.py=20=F0=9F=94=A7=20fix(api=5Fkey.py):=20fix?= =?UTF-8?q?=20type=20annotations=20and=20import=20in=20api=5Fkey.py=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(api=5Fkey.py):=20fix=20type=20annotations=20?= =?UTF-8?q?and?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/api_key.py | 15 +++++++++------ .../services/database/models/api_key/api_key.py | 9 +++++---- .../services/database/models/api_key/crud.py | 7 ++++--- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/backend/langflow/api/v1/api_key.py b/src/backend/langflow/api/v1/api_key.py index e7b2dd163..df2d3e420 100644 --- a/src/backend/langflow/api/v1/api_key.py +++ b/src/backend/langflow/api/v1/api_key.py @@ -1,7 +1,11 @@ +from uuid import UUID from fastapi import APIRouter, HTTPException, Depends -from langflow.api.v1.schemas import ApiKeysResponse, CreateApiKeyRequest +from langflow.api.v1.schemas import ApiKeysResponse from langflow.services.auth.utils import get_current_active_user -from langflow.services.database.models.api_key.api_key import UnmaskedApiKeyRead +from langflow.services.database.models.api_key.api_key import ( + ApiKeyCreate, + UnmaskedApiKeyRead, +) # Assuming you have these methods in your service layer from langflow.services.database.models.api_key.crud import ( @@ -26,15 +30,14 @@ def get_api_keys_route( user_id = current_user.id keys = get_api_keys(db, user_id) - result = {"total_count": len(keys), "user_id": user_id, "api_keys": keys} - return ApiKeysResponse(**result) + return ApiKeysResponse(total_count=len(keys), user_id=user_id, api_keys=keys) except Exception as e: raise HTTPException(status_code=400, detail=str(e)) @router.post("/api_key", response_model=UnmaskedApiKeyRead) def create_api_key_route( - req: CreateApiKeyRequest, + req: ApiKeyCreate, current_user: User = Depends(get_current_active_user), db: Session = Depends(get_session), ): @@ -47,7 +50,7 @@ def create_api_key_route( @router.delete("/api_key/{api_key_id}") def delete_api_key_route( - api_key_id: str, + api_key_id: UUID, current_user=Depends(get_current_active_user), db: Session = Depends(get_session), ): diff --git a/src/backend/langflow/services/database/models/api_key/api_key.py b/src/backend/langflow/services/database/models/api_key/api_key.py index 1006b1c0f..601d060b5 100644 --- a/src/backend/langflow/services/database/models/api_key/api_key.py +++ b/src/backend/langflow/services/database/models/api_key/api_key.py @@ -10,15 +10,14 @@ if TYPE_CHECKING: class ApiKeyBase(SQLModelSerializable): - api_key: str = Field(index=True, unique=True) name: Optional[str] = Field(index=True) created_at: datetime = Field(default_factory=datetime.utcnow) last_used_at: Optional[datetime] = Field(default=None) - user_id: UUID = Field() class ApiKey(ApiKeyBase, table=True): id: UUID = Field(default_factory=uuid4, primary_key=True, unique=True) + api_key: str = Field(index=True, unique=True) # User relationship user_id: UUID = Field(index=True, foreign_key="user.id") user: "User" = Relationship(back_populates="api_keys") @@ -31,12 +30,14 @@ class ApiKeyCreate(ApiKeyBase): class UnmaskedApiKeyRead(ApiKeyBase): id: UUID + api_key: str = Field(index=True, unique=True) + user_id: UUID = Field() class ApiKeyRead(ApiKeyBase): id: UUID - api_key: Optional[str] = None - user_id: Optional[UUID] = None + api_key: str = Field(index=True, unique=True) + user_id: UUID = Field() @validator("api_key", always=True) def mask_api_key(cls, v): diff --git a/src/backend/langflow/services/database/models/api_key/crud.py b/src/backend/langflow/services/database/models/api_key/crud.py index 933e7c2b3..af697b6d5 100644 --- a/src/backend/langflow/services/database/models/api_key/crud.py +++ b/src/backend/langflow/services/database/models/api_key/crud.py @@ -11,14 +11,14 @@ from langflow.services.database.models.api_key import ( ) -def get_api_keys(session: Session, user_id: str) -> List[UnmaskedApiKeyRead]: +def get_api_keys(session: Session, user_id: UUID) -> List[ApiKeyRead]: query = select(ApiKey).where(ApiKey.user_id == user_id) api_keys = session.exec(query).all() return [ApiKeyRead.from_orm(api_key) for api_key in api_keys] def create_api_key( - session: Session, api_key_create: ApiKeyCreate, user_id: str + session: Session, api_key_create: ApiKeyCreate, user_id: UUID ) -> UnmaskedApiKeyRead: # Generate a random API key with 32 bytes of randomness generated_api_key = secrets.token_urlsafe(32) @@ -26,7 +26,8 @@ def create_api_key( # hash the API key hashed_api_key = get_password_hash(generated_api_key) # Use the generated key to create the ApiKey object - api_key = ApiKey(api_key=hashed_api_key, **api_key_create.dict(), user_id=user_id) + + api_key = ApiKey(api_key=hashed_api_key, name=api_key_create.name, user_id=user_id) session.add(api_key) session.commit() From b5e4df99439c97171d3b12226ee3b0404d48378e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:49:24 -0300 Subject: [PATCH 108/134] =?UTF-8?q?=F0=9F=90=9B=20fix(flows.py):=20add=20m?= =?UTF-8?q?issing=20import=20statement=20for=20User=20model=20=F0=9F=90=9B?= =?UTF-8?q?=20fix(flows.py):=20add=20missing=20import=20statement=20for=20?= =?UTF-8?q?TYPE=5FCHECKING=20=E2=9C=A8=20feat(flows.py):=20add=20user=5Fid?= =?UTF-8?q?=20field=20to=20FlowCreate=20model=20to=20allow=20specifying=20?= =?UTF-8?q?the=20user=20for=20a=20new=20flow=20=E2=9C=A8=20feat(flows.py):?= =?UTF-8?q?=20add=20user=5Fid=20field=20to=20FlowRead=20model=20to=20inclu?= =?UTF-8?q?de=20the=20user=5Fid=20in=20the=20response=20=E2=9C=A8=20feat(f?= =?UTF-8?q?lows.py):=20add=20user=5Fid=20field=20to=20Flow=20model=20and?= =?UTF-8?q?=20create=20a=20relationship=20with=20User=20model=20=E2=9C=A8?= =?UTF-8?q?=20feat(flows.py):=20add=20current=5Fuser=20dependency=20to=20c?= =?UTF-8?q?reate=5Fflow=20endpoint=20to=20set=20the=20user=5Fid=20for=20a?= =?UTF-8?q?=20new=20flow=20=E2=9C=A8=20feat(flows.py):=20add=20current=5Fu?= =?UTF-8?q?ser=20dependency=20to=20read=5Fflows=20endpoint=20to=20filter?= =?UTF-8?q?=20flows=20by=20current=20user=20=E2=9C=A8=20feat(flows.py):=20?= =?UTF-8?q?add=20current=5Fuser=20dependency=20to=20read=5Fflow=20endpoint?= =?UTF-8?q?=20to=20filter=20flow=20by=20current=20user=20=E2=9C=A8=20feat(?= =?UTF-8?q?flows.py):=20add=20current=5Fuser=20dependency=20to=20update=5F?= =?UTF-8?q?flow=20endpoint=20to=20filter=20flow=20by=20current=20user=20?= =?UTF-8?q?=E2=9C=A8=20feat(flows.py):=20add=20current=5Fuser=20dependency?= =?UTF-8?q?=20to=20delete=5Fflow=20endpoint=20to=20filter=20flow=20by=20cu?= =?UTF-8?q?rrent=20user=20=E2=9C=A8=20feat(flows.py):=20add=20current=5Fus?= =?UTF-8?q?er=20dependency=20to=20create=5Fflows=20endpoint=20to=20set=20t?= =?UTF-8?q?he=20user=5Fid=20for=20new=20flows=20=E2=9C=A8=20feat(flows.py)?= =?UTF-8?q?:=20add=20current=5Fuser=20dependency=20to=20upload=5Ffile=20en?= =?UTF-8?q?dpoint=20to=20set=20the=20user=5Fid=20for=20new=20flows=20?= =?UTF-8?q?=E2=9C=A8=20feat(flows.py):=20add=20current=5Fuser=20dependency?= =?UTF-8?q?=20to=20download=5Ffile=20endpoint=20to=20filter=20flows=20by?= =?UTF-8?q?=20current=20user=20=F0=9F=90=9B=20fix(flow.py):=20add=20missin?= =?UTF-8?q?g=20import=20statement=20for=20User=20model=20=E2=9C=A8=20feat(?= =?UTF-8?q?flow.py):=20add=20user=5Fid=20field=20to=20Flow=20model=20to=20?= =?UTF-8?q?associate=20a=20flow=20with=20a=20user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/flows.py | 86 +++++++++++++++---- .../services/database/models/flow/flow.py | 12 ++- 2 files changed, 78 insertions(+), 20 deletions(-) diff --git a/src/backend/langflow/api/v1/flows.py b/src/backend/langflow/api/v1/flows.py index d6c63a707..b215b9f95 100644 --- a/src/backend/langflow/api/v1/flows.py +++ b/src/backend/langflow/api/v1/flows.py @@ -4,16 +4,18 @@ from fastapi.encoders import jsonable_encoder from langflow.api.utils import remove_api_keys from langflow.api.v1.schemas import FlowListCreate, FlowListRead +from langflow.services.auth.utils import get_current_active_user from langflow.services.database.models.flow import ( Flow, FlowCreate, FlowRead, FlowUpdate, ) +from langflow.services.database.models.user.user import User from langflow.services.utils import get_session from langflow.services.utils import get_settings_manager import orjson -from sqlmodel import Session, select +from sqlmodel import Session from fastapi import APIRouter, Depends, HTTPException from fastapi import File, UploadFile @@ -23,9 +25,18 @@ router = APIRouter(prefix="/flows", tags=["Flows"]) @router.post("/", response_model=FlowRead, status_code=201) -def create_flow(*, session: Session = Depends(get_session), flow: FlowCreate): +def create_flow( + *, + session: Session = Depends(get_session), + flow: FlowCreate, + current_user: User = Depends(get_current_active_user), +): """Create a new flow.""" + if flow.user_id is None: + flow.user_id = current_user.id + db_flow = Flow.from_orm(flow) + session.add(db_flow) session.commit() session.refresh(db_flow) @@ -33,31 +44,49 @@ def create_flow(*, session: Session = Depends(get_session), flow: FlowCreate): @router.get("/", response_model=list[FlowRead], status_code=200) -def read_flows(*, session: Session = Depends(get_session)): +def read_flows( + *, + session: Session = Depends(get_session), + current_user: User = Depends(get_current_active_user), +): """Read all flows.""" try: - flows = session.exec(select(Flow)).all() + flows = current_user.flows except Exception as e: raise HTTPException(status_code=500, detail=str(e)) from e return [jsonable_encoder(flow) for flow in flows] @router.get("/{flow_id}", response_model=FlowRead, status_code=200) -def read_flow(*, session: Session = Depends(get_session), flow_id: UUID): +def read_flow( + *, + session: Session = Depends(get_session), + flow_id: UUID, + current_user: User = Depends(get_current_active_user), +): """Read a flow.""" - if flow := session.get(Flow, flow_id): - return flow + if user_flow := ( + session.query(Flow) + .filter(Flow.id == flow_id) + .filter(Flow.user_id == current_user.id) + .first() + ): + return user_flow else: raise HTTPException(status_code=404, detail="Flow not found") @router.patch("/{flow_id}", response_model=FlowRead, status_code=200) def update_flow( - *, session: Session = Depends(get_session), flow_id: UUID, flow: FlowUpdate + *, + session: Session = Depends(get_session), + flow_id: UUID, + flow: FlowUpdate, + current_user: User = Depends(get_current_active_user), ): """Update a flow.""" - db_flow = session.get(Flow, flow_id) + db_flow = read_flow(session=session, flow_id=flow_id, current_user=current_user) if not db_flow: raise HTTPException(status_code=404, detail="Flow not found") flow_data = flow.dict(exclude_unset=True) @@ -65,7 +94,8 @@ def update_flow( if settings_manager.settings.REMOVE_API_KEYS: flow_data = remove_api_keys(flow_data) for key, value in flow_data.items(): - setattr(db_flow, key, value) + if value is not None: + setattr(db_flow, key, value) session.add(db_flow) session.commit() session.refresh(db_flow) @@ -73,9 +103,14 @@ def update_flow( @router.delete("/{flow_id}", status_code=200) -def delete_flow(*, session: Session = Depends(get_session), flow_id: UUID): +def delete_flow( + *, + session: Session = Depends(get_session), + flow_id: UUID, + current_user: User = Depends(get_current_active_user), +): """Delete a flow.""" - flow = session.get(Flow, flow_id) + flow = read_flow(session=session, flow_id=flow_id, current_user=current_user) if not flow: raise HTTPException(status_code=404, detail="Flow not found") session.delete(flow) @@ -87,10 +122,16 @@ def delete_flow(*, session: Session = Depends(get_session), flow_id: UUID): @router.post("/batch/", response_model=List[FlowRead], status_code=201) -def create_flows(*, session: Session = Depends(get_session), flow_list: FlowListCreate): +def create_flows( + *, + session: Session = Depends(get_session), + flow_list: FlowListCreate, + current_user: User = Depends(get_current_active_user), +): """Create multiple new flows.""" db_flows = [] for flow in flow_list.flows: + flow.user_id = current_user.id db_flow = Flow.from_orm(flow) session.add(db_flow) db_flows.append(db_flow) @@ -102,7 +143,10 @@ def create_flows(*, session: Session = Depends(get_session), flow_list: FlowList @router.post("/upload/", response_model=List[FlowRead], status_code=201) async def upload_file( - *, session: Session = Depends(get_session), file: UploadFile = File(...) + *, + session: Session = Depends(get_session), + file: UploadFile = File(...), + current_user: User = Depends(get_current_active_user), ): """Upload flows from a file.""" contents = await file.read() @@ -111,11 +155,19 @@ async def upload_file( flow_list = FlowListCreate(**data) else: flow_list = FlowListCreate(flows=[FlowCreate(**flow) for flow in data]) - return create_flows(session=session, flow_list=flow_list) + # Now we set the user_id for all flows + for flow in flow_list.flows: + flow.user_id = current_user.id + + return create_flows(session=session, flow_list=flow_list, current_user=current_user) @router.get("/download/", response_model=FlowListRead, status_code=200) -async def download_file(*, session: Session = Depends(get_session)): +async def download_file( + *, + session: Session = Depends(get_session), + current_user: User = Depends(get_current_active_user), +): """Download all flows as a file.""" - flows = read_flows(session=session) + flows = read_flows(session=session, current_user=current_user) return FlowListRead(flows=flows) diff --git a/src/backend/langflow/services/database/models/flow/flow.py b/src/backend/langflow/services/database/models/flow/flow.py index a05de5791..e6ad4af4a 100644 --- a/src/backend/langflow/services/database/models/flow/flow.py +++ b/src/backend/langflow/services/database/models/flow/flow.py @@ -2,9 +2,12 @@ from langflow.services.database.models.base import SQLModelSerializable from pydantic import validator -from sqlmodel import Field, JSON, Column +from sqlmodel import Field, JSON, Column, Relationship from uuid import UUID, uuid4 -from typing import Dict, Optional +from typing import Dict, Optional, TYPE_CHECKING + +if TYPE_CHECKING: + from langflow.services.database.models.user import User class FlowBase(SQLModelSerializable): @@ -31,14 +34,17 @@ class FlowBase(SQLModelSerializable): class Flow(FlowBase, table=True): id: UUID = Field(default_factory=uuid4, primary_key=True, unique=True) data: Optional[Dict] = Field(default=None, sa_column=Column(JSON)) + user_id: UUID = Field(index=True, foreign_key="user.id") + user: "User" = Relationship(back_populates="flows") class FlowCreate(FlowBase): - pass + user_id: Optional[UUID] = None class FlowRead(FlowBase): id: UUID + user_id: UUID = Field() class FlowUpdate(SQLModelSerializable): From 00e5f70fe1654e70049d76830e9b640a034eabee Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:49:46 -0300 Subject: [PATCH 109/134] =?UTF-8?q?=F0=9F=94=80=20chore(user.py):=20add=20?= =?UTF-8?q?relationship=20to=20flows=20in=20User=20model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/database/models/user/user.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/backend/langflow/services/database/models/user/user.py b/src/backend/langflow/services/database/models/user/user.py index b6c27c2dc..5f83b4d88 100644 --- a/src/backend/langflow/services/database/models/user/user.py +++ b/src/backend/langflow/services/database/models/user/user.py @@ -8,6 +8,7 @@ from uuid import UUID, uuid4 if TYPE_CHECKING: from langflow.services.database.models.api_key import ApiKey + from langflow.services.database.models.flow import Flow class User(SQLModelSerializable, table=True): @@ -20,6 +21,7 @@ class User(SQLModelSerializable, table=True): updated_at: datetime = Field(default_factory=datetime.utcnow) last_login_at: Optional[datetime] = Field() api_keys: list["ApiKey"] = Relationship(back_populates="user") + flows: list["Flow"] = Relationship(back_populates="user") class UserCreate(SQLModel): From 3b2bfd06cc2091dec706bddceebe7e5e01fd6742 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:49:57 -0300 Subject: [PATCH 110/134] =?UTF-8?q?=F0=9F=94=A7=20fix(test=5Fdatabase.py):?= =?UTF-8?q?=20fix=20test=5Fcreate=5Fflow=20function=20signature=20to=20inc?= =?UTF-8?q?lude=20active=5Fuser=20and=20logged=5Fin=5Fheaders=20parameters?= =?UTF-8?q?=20=F0=9F=94=A7=20fix(test=5Fdatabase.py):=20fix=20test=5Fread?= =?UTF-8?q?=5Fflows=20function=20signature=20to=20include=20active=5Fuser?= =?UTF-8?q?=20and=20logged=5Fin=5Fheaders=20parameters=20=F0=9F=94=A7=20fi?= =?UTF-8?q?x(test=5Fdatabase.py):=20fix=20test=5Fread=5Fflow=20function=20?= =?UTF-8?q?signature=20to=20include=20active=5Fuser=20and=20logged=5Fin=5F?= =?UTF-8?q?headers=20parameters=20=F0=9F=94=A7=20fix(test=5Fdatabase.py):?= =?UTF-8?q?=20fix=20test=5Fupdate=5Fflow=20function=20signature=20to=20inc?= =?UTF-8?q?lude=20active=5Fuser=20and=20logged=5Fin=5Fheaders=20parameters?= =?UTF-8?q?=20=F0=9F=94=A7=20fix(test=5Fdatabase.py):=20fix=20test=5Fdelet?= =?UTF-8?q?e=5Fflow=20function=20signature=20to=20include=20active=5Fuser?= =?UTF-8?q?=20and=20logged=5Fin=5Fheaders=20parameters=20=F0=9F=94=A7=20fi?= =?UTF-8?q?x(test=5Fdatabase.py):=20fix=20test=5Fcreate=5Fflows=20function?= =?UTF-8?q?=20signature=20to=20include=20logged=5Fin=5Fheaders=20parameter?= =?UTF-8?q?=20=F0=9F=94=A7=20fix(test=5Fdatabase.py):=20fix=20test=5Fuploa?= =?UTF-8?q?d=5Ffile=20function=20signature=20to=20include=20logged=5Fin=5F?= =?UTF-8?q?headers=20parameter=20=F0=9F=94=A7=20fix(test=5Fdatabase.py):?= =?UTF-8?q?=20fix=20test=5Fdownload=5Ffile=20function=20signature=20to=20i?= =?UTF-8?q?nclude=20active=5Fuser=20and=20logged=5Fin=5Fheaders=20paramete?= =?UTF-8?q?rs=20=F0=9F=94=A7=20fix(test=5Fdatabase.py):=20fix=20test=5Fcre?= =?UTF-8?q?ate=5Fflow=5Fwith=5Finvalid=5Fdata=20function=20signature=20to?= =?UTF-8?q?=20include=20active=5Fuser=20and=20logged=5Fin=5Fheaders=20para?= =?UTF-8?q?meters=20=F0=9F=94=A7=20fix(test=5Fdatabase.py):=20fix=20test?= =?UTF-8?q?=5Fget=5Fnonexistent=5Fflow=20function=20signature=20to=20inclu?= =?UTF-8?q?de=20active=5Fuser=20and=20logged=5Fin=5Fheaders=20parameters?= =?UTF-8?q?=20=F0=9F=94=A7=20fix(test=5Fdatabase.py):=20fix=20test=5Fupdat?= =?UTF-8?q?e=5Fflow=5Fidempotency=20function=20signature=20to=20include=20?= =?UTF-8?q?active=5Fuser=20and=20logged=5Fin=5Fheaders=20parameters=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(test=5Fdatabase.py):=20fix=20test=5Fupdate?= =?UTF-8?q?=5Fnonexistent=5Fflow=20function=20signature=20to=20include=20a?= =?UTF-8?q?ctive=5Fuser=20and=20logged=5Fin=5Fheaders=20parameters=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(test=5Fdatabase.py):=20fix=20test=5Fdelete?= =?UTF-8?q?=5Fnonexistent=5Fflow=20function=20signature=20to=20include=20a?= =?UTF-8?q?ctive=5Fuser=20and=20logged=5Fin=5Fheaders=20parameters=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(test=5Fdatabase.py):=20fix=20test=5Fread=5Fe?= =?UTF-8?q?mpty=5Fflows=20function=20signature=20to=20include=20active=5Fu?= =?UTF-8?q?ser=20and=20logged=5Fin=5Fheaders=20parameters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_database.py | 104 +++++++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 35 deletions(-) diff --git a/tests/test_database.py b/tests/test_database.py index 48e253026..e4f68ca56 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -25,63 +25,69 @@ def json_style(): ) -def test_create_flow(client: TestClient, json_flow: str): +def test_create_flow( + client: TestClient, json_flow: str, active_user, logged_in_headers +): flow = orjson.loads(json_flow) data = flow["data"] flow = FlowCreate(name="Test Flow", description="description", data=data) - response = client.post("api/v1/flows/", json=flow.dict()) + response = client.post("api/v1/flows/", json=flow.dict(), headers=logged_in_headers) assert response.status_code == 201 assert response.json()["name"] == flow.name assert response.json()["data"] == flow.data # flow is optional so we can create a flow without a flow flow = FlowCreate(name="Test Flow") - response = client.post("api/v1/flows/", json=flow.dict(exclude_unset=True)) + response = client.post( + "api/v1/flows/", json=flow.dict(exclude_unset=True), headers=logged_in_headers + ) assert response.status_code == 201 assert response.json()["name"] == flow.name assert response.json()["data"] == flow.data -def test_read_flows(client: TestClient, json_flow: str): +def test_read_flows(client: TestClient, json_flow: str, active_user, logged_in_headers): flow_data = orjson.loads(json_flow) data = flow_data["data"] flow = FlowCreate(name="Test Flow", description="description", data=data) - response = client.post("api/v1/flows/", json=flow.dict()) + response = client.post("api/v1/flows/", json=flow.dict(), headers=logged_in_headers) assert response.status_code == 201 assert response.json()["name"] == flow.name assert response.json()["data"] == flow.data flow = FlowCreate(name="Test Flow", description="description", data=data) - response = client.post("api/v1/flows/", json=flow.dict()) + response = client.post("api/v1/flows/", json=flow.dict(), headers=logged_in_headers) assert response.status_code == 201 assert response.json()["name"] == flow.name assert response.json()["data"] == flow.data - response = client.get("api/v1/flows/") + response = client.get("api/v1/flows/", headers=logged_in_headers) assert response.status_code == 200 assert len(response.json()) > 0 -def test_read_flow(client: TestClient, json_flow: str): +def test_read_flow(client: TestClient, json_flow: str, active_user, logged_in_headers): flow = orjson.loads(json_flow) data = flow["data"] flow = FlowCreate(name="Test Flow", description="description", data=data) - response = client.post("api/v1/flows/", json=flow.dict()) + response = client.post("api/v1/flows/", json=flow.dict(), headers=logged_in_headers) flow_id = response.json()["id"] # flow_id should be a UUID but is a string # turn it into a UUID flow_id = UUID(flow_id) - response = client.get(f"api/v1/flows/{flow_id}") + response = client.get(f"api/v1/flows/{flow_id}", headers=logged_in_headers) assert response.status_code == 200 assert response.json()["name"] == flow.name assert response.json()["data"] == flow.data -def test_update_flow(client: TestClient, json_flow: str): +def test_update_flow( + client: TestClient, json_flow: str, active_user, logged_in_headers +): flow = orjson.loads(json_flow) data = flow["data"] flow = FlowCreate(name="Test Flow", description="description", data=data) - response = client.post("api/v1/flows/", json=flow.dict()) + response = client.post("api/v1/flows/", json=flow.dict(), headers=logged_in_headers) flow_id = response.json()["id"] updated_flow = FlowUpdate( @@ -89,7 +95,9 @@ def test_update_flow(client: TestClient, json_flow: str): description="updated description", data=data, ) - response = client.patch(f"api/v1/flows/{flow_id}", json=updated_flow.dict()) + response = client.patch( + f"api/v1/flows/{flow_id}", json=updated_flow.dict(), headers=logged_in_headers + ) assert response.status_code == 200 assert response.json()["name"] == updated_flow.name @@ -97,18 +105,22 @@ def test_update_flow(client: TestClient, json_flow: str): # assert response.json()["data"] == updated_flow.data -def test_delete_flow(client: TestClient, json_flow: str): +def test_delete_flow( + client: TestClient, json_flow: str, active_user, logged_in_headers +): flow = orjson.loads(json_flow) data = flow["data"] flow = FlowCreate(name="Test Flow", description="description", data=data) - response = client.post("api/v1/flows/", json=flow.dict()) + response = client.post("api/v1/flows/", json=flow.dict(), headers=logged_in_headers) flow_id = response.json()["id"] - response = client.delete(f"api/v1/flows/{flow_id}") + response = client.delete(f"api/v1/flows/{flow_id}", headers=logged_in_headers) assert response.status_code == 200 assert response.json()["message"] == "Flow deleted successfully" -def test_create_flows(client: TestClient, session: Session, json_flow: str): +def test_create_flows( + client: TestClient, session: Session, json_flow: str, logged_in_headers +): flow = orjson.loads(json_flow) data = flow["data"] # Create test data @@ -119,7 +131,9 @@ def test_create_flows(client: TestClient, session: Session, json_flow: str): ] ) # Make request to endpoint - response = client.post("api/v1/flows/batch/", json=flow_list.dict()) + response = client.post( + "api/v1/flows/batch/", json=flow_list.dict(), headers=logged_in_headers + ) # Check response status code assert response.status_code == 201 # Check response data @@ -133,7 +147,9 @@ def test_create_flows(client: TestClient, session: Session, json_flow: str): assert response_data[1]["data"] == data -def test_upload_file(client: TestClient, session: Session, json_flow: str): +def test_upload_file( + client: TestClient, session: Session, json_flow: str, logged_in_headers +): flow = orjson.loads(json_flow) data = flow["data"] # Create test data @@ -147,6 +163,7 @@ def test_upload_file(client: TestClient, session: Session, json_flow: str): response = client.post( "api/v1/flows/upload/", files={"file": ("examples.json", file_contents, "application/json")}, + headers=logged_in_headers, ) # Check response status code assert response.status_code == 201 @@ -161,7 +178,9 @@ def test_upload_file(client: TestClient, session: Session, json_flow: str): assert response_data[1]["data"] == data -def test_download_file(client: TestClient, session: Session, json_flow): +def test_download_file( + client: TestClient, session: Session, json_flow, active_user, logged_in_headers +): flow = orjson.loads(json_flow) data = flow["data"] # Create test data @@ -172,11 +191,12 @@ def test_download_file(client: TestClient, session: Session, json_flow): ] ) for flow in flow_list.flows: + flow.user_id = active_user.id db_flow = Flow.from_orm(flow) session.add(db_flow) session.commit() # Make request to endpoint - response = client.get("api/v1/flows/download/") + response = client.get("api/v1/flows/download/", headers=logged_in_headers) # Check response status code assert response.status_code == 200 # Check response data @@ -190,31 +210,43 @@ def test_download_file(client: TestClient, session: Session, json_flow): assert response_data[1]["data"] == data -def test_create_flow_with_invalid_data(client: TestClient): +def test_create_flow_with_invalid_data( + client: TestClient, active_user, logged_in_headers +): flow = {"name": "a" * 256, "data": "Invalid flow data"} - response = client.post("api/v1/flows/", json=flow) + response = client.post("api/v1/flows/", json=flow, headers=logged_in_headers) assert response.status_code == 422 -def test_get_nonexistent_flow(client: TestClient): +def test_get_nonexistent_flow(client: TestClient, active_user, logged_in_headers): uuid = uuid4() - response = client.get(f"api/v1/flows/{uuid}") + response = client.get(f"api/v1/flows/{uuid}", headers=logged_in_headers) assert response.status_code == 404 -def test_update_flow_idempotency(client: TestClient, json_flow: str): +def test_update_flow_idempotency( + client: TestClient, json_flow: str, active_user, logged_in_headers +): flow_data = orjson.loads(json_flow) data = flow_data["data"] flow_data = FlowCreate(name="Test Flow", description="description", data=data) - response = client.post("api/v1/flows/", json=flow_data.dict()) + response = client.post( + "api/v1/flows/", json=flow_data.dict(), headers=logged_in_headers + ) flow_id = response.json()["id"] updated_flow = FlowCreate(name="Updated Flow", description="description", data=data) - response1 = client.put(f"api/v1/flows/{flow_id}", json=updated_flow.dict()) - response2 = client.put(f"api/v1/flows/{flow_id}", json=updated_flow.dict()) + response1 = client.put( + f"api/v1/flows/{flow_id}", json=updated_flow.dict(), headers=logged_in_headers + ) + response2 = client.put( + f"api/v1/flows/{flow_id}", json=updated_flow.dict(), headers=logged_in_headers + ) assert response1.json() == response2.json() -def test_update_nonexistent_flow(client: TestClient, json_flow: str): +def test_update_nonexistent_flow( + client: TestClient, json_flow: str, active_user, logged_in_headers +): flow_data = orjson.loads(json_flow) data = flow_data["data"] uuid = uuid4() @@ -223,17 +255,19 @@ def test_update_nonexistent_flow(client: TestClient, json_flow: str): description="description", data=data, ) - response = client.patch(f"api/v1/flows/{uuid}", json=updated_flow.dict()) + response = client.patch( + f"api/v1/flows/{uuid}", json=updated_flow.dict(), headers=logged_in_headers + ) assert response.status_code == 404 -def test_delete_nonexistent_flow(client: TestClient): +def test_delete_nonexistent_flow(client: TestClient, active_user, logged_in_headers): uuid = uuid4() - response = client.delete(f"api/v1/flows/{uuid}") + response = client.delete(f"api/v1/flows/{uuid}", headers=logged_in_headers) assert response.status_code == 404 -def test_read_empty_flows(client: TestClient): - response = client.get("api/v1/flows/") +def test_read_empty_flows(client: TestClient, active_user, logged_in_headers): + response = client.get("api/v1/flows/", headers=logged_in_headers) assert response.status_code == 200 assert len(response.json()) == 0 From dae856d0f6832016cc97656d58d03e6e585bd34a Mon Sep 17 00:00:00 2001 From: Guangya Liu Date: Thu, 24 Aug 2023 12:28:42 -0400 Subject: [PATCH 111/134] Added readme for docker example --- docker_example/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 docker_example/README.md diff --git a/docker_example/README.md b/docker_example/README.md new file mode 100644 index 000000000..9e72dc645 --- /dev/null +++ b/docker_example/README.md @@ -0,0 +1,9 @@ +# LangFlow Docker Running + +```sh +git clone git@github.com:logspace-ai/langflow.git +cd langflow/docker_example +docker compose up +``` + +The web UI will be accessible on port [7860](http://localhost:7860/) \ No newline at end of file From 0a4c19082d9e94e340d8add4c8a995210c2d57a4 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 11:16:08 -0300 Subject: [PATCH 112/134] =?UTF-8?q?=F0=9F=93=A6=20chore(pyproject.toml):?= =?UTF-8?q?=20add=20markupsafe=20dependency=20to=20improve=20compatibility?= =?UTF-8?q?=20and=20security=20=F0=9F=94=92=20chore(pyproject.toml):=20upd?= =?UTF-8?q?ate=20black=20dependency=20to=20version=2023.1.0=20for=20develo?= =?UTF-8?q?pment=20purposes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poetry.lock | 14 +++++--------- pyproject.toml | 1 + 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index d775029c8..7580b7b71 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3022,9 +3022,9 @@ files = [ ] [package.dependencies] -diskcache = ">=5.6.1" -numpy = ">=1.20.0" -typing-extensions = ">=4.5.0" +diskcache = ">=5.6.1,<6.0.0" +numpy = ">=1.24.4,<2.0.0" +typing-extensions = ">=4.7.1,<5.0.0" [package.extras] server = ["fastapi (>=0.100.0)", "pydantic-settings (>=2.0.1)", "sse-starlette (>=1.6.1)", "uvicorn (>=0.23.2,<0.24.0)"] @@ -3057,8 +3057,6 @@ files = [ {file = "lxml-4.9.3-cp27-cp27m-macosx_11_0_x86_64.whl", hash = "sha256:b0a545b46b526d418eb91754565ba5b63b1c0b12f9bd2f808c852d9b4b2f9b5c"}, {file = "lxml-4.9.3-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:075b731ddd9e7f68ad24c635374211376aa05a281673ede86cbe1d1b3455279d"}, {file = "lxml-4.9.3-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1e224d5755dba2f4a9498e150c43792392ac9b5380aa1b845f98a1618c94eeef"}, - {file = "lxml-4.9.3-cp27-cp27m-win32.whl", hash = "sha256:2c74524e179f2ad6d2a4f7caf70e2d96639c0954c943ad601a9e146c76408ed7"}, - {file = "lxml-4.9.3-cp27-cp27m-win_amd64.whl", hash = "sha256:4f1026bc732b6a7f96369f7bfe1a4f2290fb34dce00d8644bc3036fb351a4ca1"}, {file = "lxml-4.9.3-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c0781a98ff5e6586926293e59480b64ddd46282953203c76ae15dbbbf302e8bb"}, {file = "lxml-4.9.3-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:cef2502e7e8a96fe5ad686d60b49e1ab03e438bd9123987994528febd569868e"}, {file = "lxml-4.9.3-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:b86164d2cff4d3aaa1f04a14685cbc072efd0b4f99ca5708b2ad1b9b5988a991"}, @@ -3261,7 +3259,7 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] name = "markupsafe" version = "2.1.3" description = "Safely add untrusted strings to HTML/XML markup." -optional = true +optional = false python-versions = ">=3.7" files = [ {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"}, @@ -4408,7 +4406,6 @@ files = [ {file = "Pillow-10.0.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:3b08d4cc24f471b2c8ca24ec060abf4bebc6b144cb89cba638c720546b1cf538"}, {file = "Pillow-10.0.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d737a602fbd82afd892ca746392401b634e278cb65d55c4b7a8f48e9ef8d008d"}, {file = "Pillow-10.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:3a82c40d706d9aa9734289740ce26460a11aeec2d9c79b7af87bb35f0073c12f"}, - {file = "Pillow-10.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:bc2ec7c7b5d66b8ec9ce9f720dbb5fa4bace0f545acd34870eff4a369b44bf37"}, {file = "Pillow-10.0.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:d80cf684b541685fccdd84c485b31ce73fc5c9b5d7523bf1394ce134a60c6883"}, {file = "Pillow-10.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:76de421f9c326da8f43d690110f0e79fe3ad1e54be811545d7d91898b4c8493e"}, {file = "Pillow-10.0.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81ff539a12457809666fef6624684c008e00ff6bf455b4b89fd00a140eecd640"}, @@ -4418,7 +4415,6 @@ files = [ {file = "Pillow-10.0.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d50b6aec14bc737742ca96e85d6d0a5f9bfbded018264b3b70ff9d8c33485551"}, {file = "Pillow-10.0.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:00e65f5e822decd501e374b0650146063fbb30a7264b4d2744bdd7b913e0cab5"}, {file = "Pillow-10.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:f31f9fdbfecb042d046f9d91270a0ba28368a723302786c0009ee9b9f1f60199"}, - {file = "Pillow-10.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:1ce91b6ec08d866b14413d3f0bbdea7e24dfdc8e59f562bb77bc3fe60b6144ca"}, {file = "Pillow-10.0.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:349930d6e9c685c089284b013478d6f76e3a534e36ddfa912cde493f235372f3"}, {file = "Pillow-10.0.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3a684105f7c32488f7153905a4e3015a3b6c7182e106fe3c37fbb5ef3e6994c3"}, {file = "Pillow-10.0.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4f69b3700201b80bb82c3a97d5e9254084f6dd5fb5b16fc1a7b974260f89f43"}, @@ -7746,4 +7742,4 @@ local = ["ctransformers", "llama-cpp-python", "sentence-transformers"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.11" -content-hash = "8ad605e7ea30f2819dbc03eac6c2e67576a98d1efa4890912414a7568fc27441" +content-hash = "fc078c55010bf3749e684cf032a4fc64b3918b15b60b4521c17a27815518032e" diff --git a/pyproject.toml b/pyproject.toml index 01e04fd5d..31e3d90ed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -82,6 +82,7 @@ passlib = "^1.7.4" bcrypt = "^4.0.1" python-jose = "^3.3.0" metaphor-python = "^0.1.11" +markupsafe = "^2.1.3" [tool.poetry.group.dev.dependencies] black = "^23.1.0" From 82826d6b44b9158466fcb9290e4bcd8c871ac79b Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Fri, 25 Aug 2023 15:15:19 -0300 Subject: [PATCH 113/134] fix(constants.ts): update BASE_URL_API to "/api/v1/" to match backend API endpoint fix(API/index.ts): update API endpoints to use BASE_URL_API instead of hardcoding "/api/v1/" --- src/frontend/src/constants/constants.ts | 2 +- src/frontend/src/controllers/API/index.ts | 36 +++++++++++------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/frontend/src/constants/constants.ts b/src/frontend/src/constants/constants.ts index 5c8730f82..dee87dcdb 100644 --- a/src/frontend/src/constants/constants.ts +++ b/src/frontend/src/constants/constants.ts @@ -619,7 +619,7 @@ export const FETCH_ERROR_MESSAGE = "Couldn't establish a connection."; export const FETCH_ERROR_DESCRIPION = "Check if everything is working properly and try again."; -export const BASE_URL_API = "http://localhost:7860/"; +export const BASE_URL_API = "/api/v1/"; export const SIGN_UP_SUCCESS = "Account created! Await admin activation. "; diff --git a/src/frontend/src/controllers/API/index.ts b/src/frontend/src/controllers/API/index.ts index 796fbceb7..b49eb84ac 100644 --- a/src/frontend/src/controllers/API/index.ts +++ b/src/frontend/src/controllers/API/index.ts @@ -25,7 +25,7 @@ import { * @returns {Promise>} A promise that resolves to an AxiosResponse containing all the objects. */ export async function getAll(): Promise> { - return await api.get(`/api/v1/all`); + return await api.get(`${BASE_URL_API}all`); } const GITHUB_API_URL = "https://api.github.com"; @@ -47,13 +47,13 @@ export async function getRepoStars(owner: string, repo: string) { * @returns {AxiosResponse} The API response. */ export async function sendAll(data: sendAllProps) { - return await api.post(`/api/v1/predict`, data); + return await api.post(`${BASE_URL_API}predict`, data); } export async function postValidateCode( code: string ): Promise> { - return await api.post("/api/v1/validate/code", { code }); + return await api.post(`${BASE_URL_API}validate/code`, { code }); } /** @@ -68,7 +68,7 @@ export async function postValidatePrompt( template: string, frontend_node: APIClassType ): Promise> { - return await api.post("/api/v1/validate/prompt", { + return await api.post(`${BASE_URL_API}validate/prompt`, { name: name, template: template, frontend_node: frontend_node, @@ -112,7 +112,7 @@ export async function saveFlowToDatabase(newFlow: { style?: FlowStyleType; }): Promise { try { - const response = await api.post("/api/v1/flows/", { + const response = await api.post(`${BASE_URL_API}flows/`, { name: newFlow.name, data: newFlow.data, description: newFlow.description, @@ -138,7 +138,7 @@ export async function updateFlowInDatabase( updatedFlow: FlowType ): Promise { try { - const response = await api.patch(`/api/v1/flows/${updatedFlow.id}`, { + const response = await api.patch(`${BASE_URL_API}flows/${updatedFlow.id}`, { name: updatedFlow.name, data: updatedFlow.data, description: updatedFlow.description, @@ -162,7 +162,7 @@ export async function updateFlowInDatabase( */ export async function readFlowsFromDatabase() { try { - const response = await api.get("/api/v1/flows/"); + const response = await api.get(`${BASE_URL_API}flows/`); if (response.status !== 200) { throw new Error(`HTTP error! status: ${response.status}`); } @@ -175,7 +175,7 @@ export async function readFlowsFromDatabase() { export async function downloadFlowsFromDatabase() { try { - const response = await api.get("/api/v1/flows/download/"); + const response = await api.get(`${BASE_URL_API}flows/download/`); if (response.status !== 200) { throw new Error(`HTTP error! status: ${response.status}`); } @@ -188,7 +188,7 @@ export async function downloadFlowsFromDatabase() { export async function uploadFlowsToDatabase(flows: FormData) { try { - const response = await api.post(`/api/v1/flows/upload/`, flows); + const response = await api.post(`${BASE_URL_API}flows/upload/`, flows); if (response.status !== 201) { throw new Error(`HTTP error! status: ${response.status}`); @@ -209,7 +209,7 @@ export async function uploadFlowsToDatabase(flows: FormData) { */ export async function deleteFlowFromDatabase(flowId: string) { try { - const response = await api.delete(`/api/v1/flows/${flowId}`); + const response = await api.delete(`${BASE_URL_API}flows/${flowId}`); if (response.status !== 200) { throw new Error(`HTTP error! status: ${response.status}`); } @@ -229,7 +229,7 @@ export async function deleteFlowFromDatabase(flowId: string) { */ export async function getFlowFromDatabase(flowId: number) { try { - const response = await api.get(`/api/v1/flows/${flowId}`); + const response = await api.get(`${BASE_URL_API}flows/${flowId}`); if (response.status !== 200) { throw new Error(`HTTP error! status: ${response.status}`); } @@ -248,7 +248,7 @@ export async function getFlowFromDatabase(flowId: number) { */ export async function getFlowStylesFromDatabase() { try { - const response = await api.get("/api/v1/flow_styles/"); + const response = await api.get(`${BASE_URL_API}flow_styles/`); if (response.status !== 200) { throw new Error(`HTTP error! status: ${response.status}`); } @@ -268,7 +268,7 @@ export async function getFlowStylesFromDatabase() { */ export async function saveFlowStyleToDatabase(flowStyle: FlowStyleType) { try { - const response = await api.post("/api/v1/flow_styles/", flowStyle, { + const response = await api.post(`${BASE_URL_API}flow_styles/`, flowStyle, { headers: { accept: "application/json", "Content-Type": "application/json", @@ -291,7 +291,7 @@ export async function saveFlowStyleToDatabase(flowStyle: FlowStyleType) { * @returns {Promise>} A promise that resolves to an AxiosResponse containing the version information. */ export async function getVersion() { - const respnose = await api.get("/api/v1/version"); + const respnose = await api.get(`${BASE_URL_API}version`); return respnose.data; } @@ -313,7 +313,7 @@ export async function getHealth() { export async function getBuildStatus( flowId: string ): Promise { - return await api.get(`/api/v1/build/${flowId}/status`); + return await api.get(`${BASE_URL_API}build/${flowId}/status`); } //docs for postbuildinit @@ -326,7 +326,7 @@ export async function getBuildStatus( export async function postBuildInit( flow: FlowType ): Promise> { - return await api.post(`/api/v1/build/init/${flow.id}`, flow); + return await api.post(`${BASE_URL_API}build/init/${flow.id}`, flow); } // fetch(`/upload/${id}`, { @@ -344,14 +344,14 @@ export async function uploadFile( ): Promise> { const formData = new FormData(); formData.append("file", file); - return await api.post(`/api/v1/upload/${id}`, formData); + return await api.post(`${BASE_URL_API}upload/${id}`, formData); } export async function postCustomComponent( code: string, apiClass: APIClassType ): Promise> { - return await api.post(`/api/v1/custom_component`, { code }); + return await api.post(`${BASE_URL_API}custom_component`, { code }); } export async function onLogin(user: LoginType) { From c268b2be1728df1cfd1f9bcb62fc8aff5f3378cb Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 15:19:13 -0300 Subject: [PATCH 114/134] =?UTF-8?q?=F0=9F=94=A5=20refactor(models):=20remo?= =?UTF-8?q?ve=20Token=20model=20and=20references=20to=20it=20to=20simplify?= =?UTF-8?q?=20the=20codebase=20and=20remove=20unused=20code=20=F0=9F=94=A5?= =?UTF-8?q?=20refactor(test=5Fcustom=5Fcomponent.py):=20remove=20unused=20?= =?UTF-8?q?fixture=20and=20imports=20to=20clean=20up=20the=20test=20file?= =?UTF-8?q?=20=F0=9F=94=A7=20chore(test=5Fcustom=5Fcomponent.py):=20update?= =?UTF-8?q?=20component=20fixture=20to=20include=20user=5Fid=20parameter?= =?UTF-8?q?=20for=20testing=20purposes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/database/models/__init__.py | 3 +-- .../langflow/services/database/models/token/__init__.py | 5 ----- .../langflow/services/database/models/token/token.py | 7 ------- tests/test_custom_component.py | 5 +++-- 4 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 src/backend/langflow/services/database/models/token/__init__.py delete mode 100644 src/backend/langflow/services/database/models/token/token.py diff --git a/src/backend/langflow/services/database/models/__init__.py b/src/backend/langflow/services/database/models/__init__.py index 01e81e277..3cc4231a3 100644 --- a/src/backend/langflow/services/database/models/__init__.py +++ b/src/backend/langflow/services/database/models/__init__.py @@ -1,6 +1,5 @@ from .flow import Flow from .user import User -from .token import Token from .api_key import ApiKey -__all__ = ["Flow", "User", "Token", "ApiKey"] +__all__ = ["Flow", "User", "ApiKey"] diff --git a/src/backend/langflow/services/database/models/token/__init__.py b/src/backend/langflow/services/database/models/token/__init__.py deleted file mode 100644 index 9b9fa397d..000000000 --- a/src/backend/langflow/services/database/models/token/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .token import Token - -__all__ = [ - "Token", -] diff --git a/src/backend/langflow/services/database/models/token/token.py b/src/backend/langflow/services/database/models/token/token.py deleted file mode 100644 index 68c70f07f..000000000 --- a/src/backend/langflow/services/database/models/token/token.py +++ /dev/null @@ -1,7 +0,0 @@ -from pydantic import BaseModel - - -class Token(BaseModel): - access_token: str - refresh_token: str - token_type: str diff --git a/tests/test_custom_component.py b/tests/test_custom_component.py index 4dc8c9f1a..e75dc0e5b 100644 --- a/tests/test_custom_component.py +++ b/tests/test_custom_component.py @@ -473,15 +473,16 @@ def test_build_config_no_code(): @pytest.fixture -def component(): +def component(client, active_user): return CustomComponent( + user_id=active_user.id, field_config={ "fields": { "llm": {"type": "str"}, "url": {"type": "str"}, "year": {"type": "int"}, } - } + }, ) From 1a50bcd183a6a18572a1341d986d17d59639531d Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 15:19:31 -0300 Subject: [PATCH 115/134] =?UTF-8?q?=F0=9F=90=9B=20fix(base.py):=20change?= =?UTF-8?q?=20return=20type=20of=20generator=5Fbuild=20method=20to=20Gener?= =?UTF-8?q?ator[Vertex,=20None,=20None]=20for=20better=20type=20hinting=20?= =?UTF-8?q?and=20clarity=20=F0=9F=90=9B=20fix(base.py):=20add=20optional?= =?UTF-8?q?=20user=5Fid=20parameter=20to=20=5Fbuild=20and=20=5Fbuild=5Flis?= =?UTF-8?q?t=5Fof=5Fnodes=5Fand=5Fupdate=5Fparams=20methods=20in=20Vertex?= =?UTF-8?q?=20class=20to=20support=20building=20with=20user-specific=20dat?= =?UTF-8?q?a=20=F0=9F=90=9B=20fix(base.py):=20add=20optional=20user=5Fid?= =?UTF-8?q?=20parameter=20to=20=5Fget=5Fand=5Finstantiate=5Fclass=20method?= =?UTF-8?q?=20in=20Vertex=20class=20to=20support=20building=20with=20user-?= =?UTF-8?q?specific=20data=20=F0=9F=90=9B=20fix(custom=5Fcomponent.py):=20?= =?UTF-8?q?add=20user=5Fid=20attribute=20to=20CustomComponent=20class=20to?= =?UTF-8?q?=20store=20the=20user=20ID=20associated=20with=20the=20componen?= =?UTF-8?q?t=20=F0=9F=90=9B=20fix(custom=5Fcomponent.py):=20add=20user=5Fi?= =?UTF-8?q?d=20parameter=20to=20list=5Fflows=20method=20in=20CustomCompone?= =?UTF-8?q?nt=20class=20to=20filter=20flows=20by=20user=20ID=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(custom=5Fcomponent.py):=20add=20user=5Fid=20?= =?UTF-8?q?parameter=20to=20get=5Fflow=20method=20in=20CustomComponent=20c?= =?UTF-8?q?lass=20to=20filter=20flows=20by=20user=20ID=20=F0=9F=90=9B=20fi?= =?UTF-8?q?x(conftest.py):=20add=20client=20parameter=20to=20active=5Fuser?= =?UTF-8?q?=20fixture=20in=20tests=20to=20fix=20missing=20dependency=20err?= =?UTF-8?q?or?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/graph/graph/base.py | 2 +- src/backend/langflow/graph/vertex/base.py | 23 +++++++++-------- .../interface/custom/custom_component.py | 25 +++++++++++++------ tests/conftest.py | 2 +- 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/backend/langflow/graph/graph/base.py b/src/backend/langflow/graph/graph/base.py index f0d3986cf..2b22d352c 100644 --- a/src/backend/langflow/graph/graph/base.py +++ b/src/backend/langflow/graph/graph/base.py @@ -144,7 +144,7 @@ class Graph: return list(reversed(sorted_vertices)) - def generator_build(self) -> Generator: + def generator_build(self) -> Generator[Vertex, None, None]: """Builds each vertex in the graph and yields it.""" sorted_vertices = self.topological_sort() logger.debug("Sorted vertices: %s", sorted_vertices) diff --git a/src/backend/langflow/graph/vertex/base.py b/src/backend/langflow/graph/vertex/base.py index 425f66315..ade10365b 100644 --- a/src/backend/langflow/graph/vertex/base.py +++ b/src/backend/langflow/graph/vertex/base.py @@ -133,13 +133,13 @@ class Vertex: # Add _type to params self.params = params - def _build(self): + def _build(self, user_id=None): """ Initiate the build process. """ logger.debug(f"Building {self.vertex_type}") - self._build_each_node_in_params_dict() - self._get_and_instantiate_class() + self._build_each_node_in_params_dict(user_id) + self._get_and_instantiate_class(user_id) self._validate_built_object() self._built = True @@ -169,23 +169,25 @@ class Vertex: """ return all(self._is_node(node) for node in value) - def _build_node_and_update_params(self, key, node): + def _build_node_and_update_params(self, key, node, user_id=None): """ Builds a given node and updates the params dictionary accordingly. """ - result = node.build() + result = node.build(user_id) self._handle_func(key, result) if isinstance(result, list): self._extend_params_list_with_result(key, result) self.params[key] = result - def _build_list_of_nodes_and_update_params(self, key, nodes): + def _build_list_of_nodes_and_update_params( + self, key, nodes: List["Vertex"], user_id=None + ): """ Iterates over a list of nodes, builds each and updates the params dictionary. """ self.params[key] = [] for node in nodes: - built = node.build() + built = node.build(user_id) if isinstance(built, list): if key not in self.params: self.params[key] = [] @@ -215,7 +217,7 @@ class Vertex: if isinstance(self.params[key], list): self.params[key].extend(result) - def _get_and_instantiate_class(self): + def _get_and_instantiate_class(self, user_id=None): """ Gets the class from a dictionary and instantiates it with the params. """ @@ -226,6 +228,7 @@ class Vertex: node_type=self.vertex_type, base_type=self.base_type, params=self.params, + user_id=user_id, ) self._update_built_object_and_artifacts(result) except Exception as exc: @@ -255,9 +258,9 @@ class Vertex: raise ValueError(message) - def build(self, force: bool = False) -> Any: + def build(self, force: bool = False, user_id=None) -> Any: if not self._built or force: - self._build() + self._build(user_id) return self._built_object diff --git a/src/backend/langflow/interface/custom/custom_component.py b/src/backend/langflow/interface/custom/custom_component.py index 88d2bcc82..1357daf68 100644 --- a/src/backend/langflow/interface/custom/custom_component.py +++ b/src/backend/langflow/interface/custom/custom_component.py @@ -1,4 +1,5 @@ -from typing import Any, Callable, List, Optional +from typing import Any, Callable, List, Optional, Union +from uuid import UUID from fastapi import HTTPException from langflow.interface.custom.constants import CUSTOM_COMPONENT_SUPPORTED_TYPES from langflow.interface.custom.component import Component @@ -22,6 +23,7 @@ class CustomComponent(Component, extra=Extra.allow): function: Optional[Callable] = None return_type_valid_list = list(CUSTOM_COMPONENT_SUPPORTED_TYPES.keys()) repr_value: Optional[Any] = "" + user_id: Optional[Union[UUID, str]] = None def __init__(self, **data): super().__init__(**data) @@ -187,11 +189,16 @@ class CustomComponent(Component, extra=Extra.allow): return build_sorted_vertices_with_caching(graph_data) def list_flows(self, *, get_session: Optional[Callable] = None) -> List[Flow]: - get_session = get_session or session_getter - db_manager = get_db_manager() - with get_session(db_manager) as session: - flows = session.query(Flow).all() - return flows + if not self.user_id: + raise ValueError("Session is invalid") + try: + get_session = get_session or session_getter + db_manager = get_db_manager() + with get_session(db_manager) as session: + flows = session.query(Flow).filter(Flow.user_id == self.user_id).all() + return flows + except Exception as e: + raise ValueError("Session is invalid") from e def get_flow( self, @@ -207,7 +214,11 @@ class CustomComponent(Component, extra=Extra.allow): if flow_id: flow = session.query(Flow).get(flow_id) elif flow_name: - flow = session.query(Flow).filter(Flow.name == flow_name).first() + flow = ( + session.query(Flow) + .filter(Flow.name == flow_name) + .filter(Flow.user_id == self.user_id) + ).first() else: raise ValueError("Either flow_name or flow_id must be provided") diff --git a/tests/conftest.py b/tests/conftest.py index 9abe89d49..1359664a0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -170,7 +170,7 @@ def test_user(client): @pytest.fixture(scope="function") -def active_user(session): +def active_user(client, session): user = User( username="activeuser", password=get_password_hash( From d8f5efabad88dd3cae09762359342207f255a0f0 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 15:21:38 -0300 Subject: [PATCH 116/134] =?UTF-8?q?=F0=9F=90=9B=20fix(loading.py):=20add?= =?UTF-8?q?=20type=20hinting=20for=20TYPE=5FCHECKING=20to=20improve=20code?= =?UTF-8?q?=20readability=20=F0=9F=90=9B=20fix(loading.py):=20add=20option?= =?UTF-8?q?al=20user=5Fid=20parameter=20to=20instantiate=5Fclass=20and=20i?= =?UTF-8?q?nstantiate=5Fbased=5Fon=5Ftype=20functions=20to=20support=20use?= =?UTF-8?q?r-specific=20custom=20components=20=E2=9C=A8=20feat(loading.py)?= =?UTF-8?q?:=20modify=20instantiate=5Fcustom=5Fcomponent=20function=20to?= =?UTF-8?q?=20use=20user=5Fid=20parameter=20and=20improve=20code=20readabi?= =?UTF-8?q?lity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../langflow/interface/initialize/loading.py | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/backend/langflow/interface/initialize/loading.py b/src/backend/langflow/interface/initialize/loading.py index 33e0d6b39..589d4b3ff 100644 --- a/src/backend/langflow/interface/initialize/loading.py +++ b/src/backend/langflow/interface/initialize/loading.py @@ -1,6 +1,6 @@ import json import orjson -from typing import Any, Callable, Dict, Sequence, Type +from typing import Any, Callable, Dict, Sequence, Type, TYPE_CHECKING from langchain.agents import agent as agent_module from langchain.agents.agent import AgentExecutor @@ -36,8 +36,13 @@ from langchain.vectorstores.base import VectorStore from langchain.document_loaders.base import BaseLoader from langflow.utils.logger import logger +if TYPE_CHECKING: + from langflow import CustomComponent -def instantiate_class(node_type: str, base_type: str, params: Dict) -> Any: + +def instantiate_class( + node_type: str, base_type: str, params: Dict, user_id=None +) -> Any: """Instantiate class from module type and key, and params""" params = convert_params_to_sets(params) params = convert_kwargs(params) @@ -48,7 +53,9 @@ def instantiate_class(node_type: str, base_type: str, params: Dict) -> Any: return custom_node(**params) logger.debug(f"Instantiating {node_type} of type {base_type}") class_object = import_by_type(_type=base_type, name=node_type) - return instantiate_based_on_type(class_object, base_type, node_type, params) + return instantiate_based_on_type( + class_object, base_type, node_type, params, user_id=user_id + ) def convert_params_to_sets(params): @@ -75,7 +82,7 @@ def convert_kwargs(params): return params -def instantiate_based_on_type(class_object, base_type, node_type, params): +def instantiate_based_on_type(class_object, base_type, node_type, params, user_id): if base_type == "agents": return instantiate_agent(node_type, class_object, params) elif base_type == "prompts": @@ -109,19 +116,19 @@ def instantiate_based_on_type(class_object, base_type, node_type, params): elif base_type == "memory": return instantiate_memory(node_type, class_object, params) elif base_type == "custom_components": - return instantiate_custom_component(node_type, class_object, params) + return instantiate_custom_component(node_type, class_object, params, user_id) elif base_type == "wrappers": return instantiate_wrapper(node_type, class_object, params) else: return class_object(**params) -def instantiate_custom_component(node_type, class_object, params): +def instantiate_custom_component(node_type, class_object, params, user_id): # we need to make a copy of the params because we will be # modifying it params_copy = params.copy() - class_object = get_function_custom(params_copy.pop("code")) - custom_component = class_object() + class_object: "CustomComponent" = get_function_custom(params_copy.pop("code")) + custom_component = class_object(user_id=user_id) built_object = custom_component.build(**params_copy) return built_object, {"repr": custom_component.custom_repr()} From 3d650c8491bf51fa497a238030fdc51f20b4c8f2 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 15:21:52 -0300 Subject: [PATCH 117/134] =?UTF-8?q?=E2=9C=A8=20feat(schemas.py):=20add=20T?= =?UTF-8?q?oken=20schema=20to=20represent=20access=20and=20refresh=20token?= =?UTF-8?q?s=20in=20API=20responses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/schemas.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/backend/langflow/api/v1/schemas.py b/src/backend/langflow/api/v1/schemas.py index 47f58d830..c0867feb5 100644 --- a/src/backend/langflow/api/v1/schemas.py +++ b/src/backend/langflow/api/v1/schemas.py @@ -163,3 +163,9 @@ class ApiKeysResponse(BaseModel): class CreateApiKeyRequest(BaseModel): name: str + + +class Token(BaseModel): + access_token: str + refresh_token: str + token_type: str From b41b3038f324926c20823378f2964a5668e50149 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 15:23:37 -0300 Subject: [PATCH 118/134] =?UTF-8?q?=F0=9F=94=84=20refactor(login.py):=20up?= =?UTF-8?q?date=20import=20statement=20for=20Token=20model=20to=20match=20?= =?UTF-8?q?new=20location=20in=20schemas=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/login.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/langflow/api/v1/login.py b/src/backend/langflow/api/v1/login.py index a11167a40..fc6d0444d 100644 --- a/src/backend/langflow/api/v1/login.py +++ b/src/backend/langflow/api/v1/login.py @@ -3,7 +3,7 @@ from fastapi import APIRouter, Depends, HTTPException, status from fastapi.security import OAuth2PasswordRequestForm from langflow.services.utils import get_session -from langflow.services.database.models import Token +from langflow.api.v1.schemas import Token from langflow.services.auth.utils import ( authenticate_user, create_user_tokens, From 853ce351c9020075fdb99e428b96b28f7cc60802 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 15:24:45 -0300 Subject: [PATCH 119/134] =?UTF-8?q?=F0=9F=90=9B=20fix(chat.py):=20add=20mi?= =?UTF-8?q?ssing=20import=20statement=20for=20get=5Fcurrent=5Factive=5Fuse?= =?UTF-8?q?r=20function=20=E2=9C=A8=20feat(chat.py):=20add=20current=5Fuse?= =?UTF-8?q?r=20dependency=20to=20chat=20and=20init=5Fbuild=20endpoints=20t?= =?UTF-8?q?o=20enforce=20authentication=20and=20authorization=20?= =?UTF-8?q?=F0=9F=94=A7=20refactor(chat.py):=20pass=20user=5Fid=20to=20ver?= =?UTF-8?q?tex.build()=20method=20in=20stream=5Fbuild=20endpoint=20to=20as?= =?UTF-8?q?sociate=20the=20build=20with=20the=20current=20user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/chat.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/backend/langflow/api/v1/chat.py b/src/backend/langflow/api/v1/chat.py index f2b494803..459abcf51 100644 --- a/src/backend/langflow/api/v1/chat.py +++ b/src/backend/langflow/api/v1/chat.py @@ -1,10 +1,18 @@ -from fastapi import APIRouter, HTTPException, WebSocket, WebSocketException, status +from fastapi import ( + APIRouter, + Depends, + HTTPException, + WebSocket, + WebSocketException, + status, +) from fastapi.responses import StreamingResponse from langflow.api.utils import build_input_keys_response from langflow.api.v1.schemas import BuildStatus, BuiltResponse, InitResponse, StreamData from langflow.services import service_manager, ServiceType from langflow.graph.graph.base import Graph +from langflow.services.auth.utils import get_current_active_user from langflow.utils.logger import logger from cachetools import LRUCache @@ -14,7 +22,9 @@ flow_data_store: LRUCache = LRUCache(maxsize=10) @router.websocket("/chat/{client_id}") -async def chat(client_id: str, websocket: WebSocket): +async def chat( + client_id: str, websocket: WebSocket, current_user=Depends(get_current_active_user) +): """Websocket endpoint for chat.""" try: chat_manager = service_manager.get(ServiceType.CHAT_MANAGER) @@ -32,7 +42,9 @@ async def chat(client_id: str, websocket: WebSocket): @router.post("/build/init/{flow_id}", response_model=InitResponse, status_code=201) -async def init_build(graph_data: dict, flow_id: str): +async def init_build( + graph_data: dict, flow_id: str, current_user=Depends(get_current_active_user) +): """Initialize the build by storing graph data and returning a unique session ID.""" try: @@ -54,6 +66,7 @@ async def init_build(graph_data: dict, flow_id: str): flow_data_store[flow_id] = { "graph_data": graph_data, "status": BuildStatus.STARTED, + "user_id": current_user.id, } return InitResponse(flowId=flow_id) @@ -99,6 +112,7 @@ async def stream_build(flow_id: str): return graph_data = flow_data_store[flow_id].get("graph_data") + user_id = flow_data_store[flow_id]["user_id"] if not graph_data: error_message = "No data provided" @@ -119,7 +133,7 @@ async def stream_build(flow_id: str): "log": f"Building node {vertex.vertex_type}", } yield str(StreamData(event="log", data=log_dict)) - vertex.build() + vertex.build(user_id) params = vertex._built_object_repr() valid = True logger.debug(f"Building node {str(vertex.vertex_type)}") From 706cdc08747181c0bdc426a6fbdd715eb934cf6b Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 15:25:09 -0300 Subject: [PATCH 120/134] =?UTF-8?q?=F0=9F=9A=80=20feat(alembic):=20add=20m?= =?UTF-8?q?igration=20script=20to=20update=20all=20tables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit adds a new migration script to update all tables in the database. The script includes the following changes: - Added columns 'created_at' and 'user_id' to the 'apikey' table - Altered the 'name' column in the 'apikey' table to allow null values - Created indexes on the 'name' and 'user_id' columns in the 'apikey' table - Created a foreign key constraint between the 'apikey' table and the 'user' table - Added the 'user_id' column to the 'flow' table - Created an index on the 'user_id' column in the 'flow' table - Created a foreign key constraint between the 'flow' table and the 'user' table - Removed the 'create_at' column from the 'apikey' table This migration script is designed to be used with Alembic for database schema updates. --- .../d3749cf7ac7e_update_all_tables.py | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py diff --git a/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py b/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py new file mode 100644 index 000000000..fee7b9b93 --- /dev/null +++ b/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py @@ -0,0 +1,53 @@ +"""Update all tables + +Revision ID: d3749cf7ac7e +Revises: 5512e39b4012 +Create Date: 2023-08-25 15:16:00.970071 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +import sqlmodel + + +# revision identifiers, used by Alembic. +revision: str = 'd3749cf7ac7e' +down_revision: Union[str, None] = '5512e39b4012' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('apikey', sa.Column('created_at', sa.DateTime(), nullable=False)) + op.add_column('apikey', sa.Column('user_id', sqlmodel.sql.sqltypes.GUID(), nullable=False)) + op.alter_column('apikey', 'name', + existing_type=sa.VARCHAR(), + nullable=True) + op.create_index(op.f('ix_apikey_name'), 'apikey', ['name'], unique=False) + op.create_index(op.f('ix_apikey_user_id'), 'apikey', ['user_id'], unique=False) + op.create_foreign_key(None, 'apikey', 'user', ['user_id'], ['id']) + op.drop_column('apikey', 'create_at') + op.add_column('flow', sa.Column('user_id', sqlmodel.sql.sqltypes.GUID(), nullable=False)) + op.create_index(op.f('ix_flow_user_id'), 'flow', ['user_id'], unique=False) + op.create_foreign_key(None, 'flow', 'user', ['user_id'], ['id']) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'flow', type_='foreignkey') + op.drop_index(op.f('ix_flow_user_id'), table_name='flow') + op.drop_column('flow', 'user_id') + op.add_column('apikey', sa.Column('create_at', sa.DATETIME(), nullable=False)) + op.drop_constraint(None, 'apikey', type_='foreignkey') + op.drop_index(op.f('ix_apikey_user_id'), table_name='apikey') + op.drop_index(op.f('ix_apikey_name'), table_name='apikey') + op.alter_column('apikey', 'name', + existing_type=sa.VARCHAR(), + nullable=False) + op.drop_column('apikey', 'user_id') + op.drop_column('apikey', 'created_at') + # ### end Alembic commands ### From 8b99cc06c4c9d91603326056ba4259660e0acd7b Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 15:28:49 -0300 Subject: [PATCH 121/134] =?UTF-8?q?=F0=9F=94=A7=20fix(update=5Fall=5Ftable?= =?UTF-8?q?s.py):=20handle=20potential=20OperationalError=20when=20adding?= =?UTF-8?q?=20columns=20to=20'apikey'=20table=20=E2=9C=A8=20feat(update=5F?= =?UTF-8?q?all=5Ftables.py):=20add=20support=20for=20'user=5Fid'=20column?= =?UTF-8?q?=20in=20'apikey'=20table=20=E2=9C=A8=20feat(update=5Fall=5Ftabl?= =?UTF-8?q?es.py):=20add=20support=20for=20'created=5Fat'=20column=20in=20?= =?UTF-8?q?'apikey'=20table=20=E2=9C=A8=20feat(update=5Fall=5Ftables.py):?= =?UTF-8?q?=20add=20support=20for=20index=20on=20'name'=20column=20in=20'a?= =?UTF-8?q?pikey'=20table=20=E2=9C=A8=20feat(update=5Fall=5Ftables.py):=20?= =?UTF-8?q?add=20support=20for=20index=20on=20'user=5Fid'=20column=20in=20?= =?UTF-8?q?'apikey'=20table=20=E2=9C=A8=20feat(update=5Fall=5Ftables.py):?= =?UTF-8?q?=20add=20foreign=20key=20constraint=20on=20'user=5Fid'=20column?= =?UTF-8?q?=20in=20'apikey'=20table=20=F0=9F=94=A7=20fix(update=5Fall=5Fta?= =?UTF-8?q?bles.py):=20handle=20potential=20OperationalError=20when=20drop?= =?UTF-8?q?ping=20'create=5Fat'=20column=20from=20'apikey'=20table=20?= =?UTF-8?q?=E2=9C=A8=20feat(update=5Fall=5Ftables.py):=20add=20support=20f?= =?UTF-8?q?or=20'user=5Fid'=20column=20in=20'flow'=20table=20=E2=9C=A8=20f?= =?UTF-8?q?eat(update=5Fall=5Ftables.py):=20add=20support=20for=20index=20?= =?UTF-8?q?on=20'user=5Fid'=20column=20in=20'flow'=20table=20=E2=9C=A8=20f?= =?UTF-8?q?eat(update=5Fall=5Ftables.py):=20add=20foreign=20key=20constrai?= =?UTF-8?q?nt=20on=20'user=5Fid'=20column=20in=20'flow'=20table=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(update=5Fall=5Ftables.py):=20handle=20potent?= =?UTF-8?q?ial=20OperationalError=20when=20dropping=20foreign=20key=20cons?= =?UTF-8?q?traint=20from=20'flow'=20table=20=F0=9F=94=A7=20fix(update=5Fal?= =?UTF-8?q?l=5Ftables.py):=20handle=20potential=20OperationalError=20when?= =?UTF-8?q?=20dropping=20index=20on=20'user=5Fid'=20column=20from=20'flow'?= =?UTF-8?q?=20table=20=F0=9F=94=A7=20fix(update=5Fall=5Ftables.py):=20hand?= =?UTF-8?q?le=20potential=20OperationalError=20when=20dropping=20'user=5Fi?= =?UTF-8?q?d'=20column=20from=20'flow'=20table=20=F0=9F=94=A7=20fix(update?= =?UTF-8?q?=5Fall=5Ftables.py):=20handle=20potential=20OperationalError=20?= =?UTF-8?q?when=20adding=20'create=5Fat'=20column=20to=20'apikey'=20table?= =?UTF-8?q?=20=F0=9F=94=A7=20fix(update=5Fall=5Ftables.py):=20handle=20pot?= =?UTF-8?q?ential=20OperationalError=20when=20dropping=20foreign=20key=20c?= =?UTF-8?q?onstraint=20from=20'apikey'=20table=20=F0=9F=94=A7=20fix(update?= =?UTF-8?q?=5Fall=5Ftables.py):=20handle=20potential=20OperationalError=20?= =?UTF-8?q?when=20dropping=20index=20on=20'user=5Fid'=20column=20from=20'a?= =?UTF-8?q?pikey'=20table=20=F0=9F=94=A7=20fix(update=5Fall=5Ftables.py):?= =?UTF-8?q?=20handle=20potential=20OperationalError=20when=20dropping=20in?= =?UTF-8?q?dex=20on=20'name'=20column=20from=20'apikey'=20table=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(update=5Fall=5Ftables.py):=20handle=20potent?= =?UTF-8?q?ial=20OperationalError=20when=20altering=20'name'=20column=20in?= =?UTF-8?q?=20'apikey'=20table=20=F0=9F=94=A7=20fix(update=5Fall=5Ftables.?= =?UTF-8?q?py):=20handle=20potential=20OperationalError=20when=20dropping?= =?UTF-8?q?=20'user=5Fid'=20column=20from=20'apikey'=20table=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(update=5Fall=5Ftables.py):=20handle=20potent?= =?UTF-8?q?ial=20OperationalError=20when=20dropping=20'created=5Fat'=20col?= =?UTF-8?q?umn=20from=20'apikey'=20table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../d3749cf7ac7e_update_all_tables.py | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py b/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py index fee7b9b93..13c0266e7 100644 --- a/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py +++ b/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py @@ -10,44 +10,49 @@ from typing import Sequence, Union from alembic import op import sqlalchemy as sa import sqlmodel - +import contextlib # revision identifiers, used by Alembic. -revision: str = 'd3749cf7ac7e' -down_revision: Union[str, None] = '5512e39b4012' +revision: str = "d3749cf7ac7e" +down_revision: Union[str, None] = "5512e39b4012" branch_labels: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None def upgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### - op.add_column('apikey', sa.Column('created_at', sa.DateTime(), nullable=False)) - op.add_column('apikey', sa.Column('user_id', sqlmodel.sql.sqltypes.GUID(), nullable=False)) - op.alter_column('apikey', 'name', - existing_type=sa.VARCHAR(), - nullable=True) - op.create_index(op.f('ix_apikey_name'), 'apikey', ['name'], unique=False) - op.create_index(op.f('ix_apikey_user_id'), 'apikey', ['user_id'], unique=False) - op.create_foreign_key(None, 'apikey', 'user', ['user_id'], ['id']) - op.drop_column('apikey', 'create_at') - op.add_column('flow', sa.Column('user_id', sqlmodel.sql.sqltypes.GUID(), nullable=False)) - op.create_index(op.f('ix_flow_user_id'), 'flow', ['user_id'], unique=False) - op.create_foreign_key(None, 'flow', 'user', ['user_id'], ['id']) + with contextlib.suppress(sa.exc.OperationalError): + op.add_column("apikey", sa.Column("created_at", sa.DateTime(), nullable=False)) + with contextlib.suppress(sa.exc.OperationalError): + op.add_column( + "apikey", sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False) + ) + with contextlib.suppress(sa.exc.OperationalError): + op.alter_column("apikey", "name", existing_type=sa.VARCHAR(), nullable=True) + with contextlib.suppress(sa.exc.OperationalError): + op.create_index(op.f("ix_apikey_name"), "apikey", ["name"], unique=False) + op.create_index(op.f("ix_apikey_user_id"), "apikey", ["user_id"], unique=False) + op.create_foreign_key(None, "apikey", "user", ["user_id"], ["id"]) + with contextlib.suppress(sa.exc.OperationalError): + op.drop_column("apikey", "create_at") + op.add_column( + "flow", sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False) + ) + op.create_index(op.f("ix_flow_user_id"), "flow", ["user_id"], unique=False) + op.create_foreign_key(None, "flow", "user", ["user_id"], ["id"]) # ### end Alembic commands ### def downgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'flow', type_='foreignkey') - op.drop_index(op.f('ix_flow_user_id'), table_name='flow') - op.drop_column('flow', 'user_id') - op.add_column('apikey', sa.Column('create_at', sa.DATETIME(), nullable=False)) - op.drop_constraint(None, 'apikey', type_='foreignkey') - op.drop_index(op.f('ix_apikey_user_id'), table_name='apikey') - op.drop_index(op.f('ix_apikey_name'), table_name='apikey') - op.alter_column('apikey', 'name', - existing_type=sa.VARCHAR(), - nullable=False) - op.drop_column('apikey', 'user_id') - op.drop_column('apikey', 'created_at') + op.drop_constraint(None, "flow", type_="foreignkey") + op.drop_index(op.f("ix_flow_user_id"), table_name="flow") + op.drop_column("flow", "user_id") + op.add_column("apikey", sa.Column("create_at", sa.DATETIME(), nullable=False)) + op.drop_constraint(None, "apikey", type_="foreignkey") + op.drop_index(op.f("ix_apikey_user_id"), table_name="apikey") + op.drop_index(op.f("ix_apikey_name"), table_name="apikey") + op.alter_column("apikey", "name", existing_type=sa.VARCHAR(), nullable=False) + op.drop_column("apikey", "user_id") + op.drop_column("apikey", "created_at") # ### end Alembic commands ### From 648bb25b3f6dc7a11138f487f280360ad389a924 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 15:31:16 -0300 Subject: [PATCH 122/134] =?UTF-8?q?=F0=9F=94=A7=20chore(update=5Fall=5Ftab?= =?UTF-8?q?les.py):=20add=20missing=20index=20and=20foreign=20key=20constr?= =?UTF-8?q?aints=20to=20apikey=20table=20=F0=9F=94=A7=20chore(update=5Fall?= =?UTF-8?q?=5Ftables.py):=20add=20missing=20index=20and=20foreign=20key=20?= =?UTF-8?q?constraints=20to=20flow=20table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../versions/d3749cf7ac7e_update_all_tables.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py b/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py index 13c0266e7..f45034d40 100644 --- a/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py +++ b/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py @@ -27,19 +27,21 @@ def upgrade() -> None: op.add_column( "apikey", sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False) ) + op.create_index(op.f("ix_apikey_user_id"), "apikey", ["user_id"], unique=False) + op.create_foreign_key(None, "apikey", "user", ["user_id"], ["id"]) with contextlib.suppress(sa.exc.OperationalError): op.alter_column("apikey", "name", existing_type=sa.VARCHAR(), nullable=True) - with contextlib.suppress(sa.exc.OperationalError): op.create_index(op.f("ix_apikey_name"), "apikey", ["name"], unique=False) - op.create_index(op.f("ix_apikey_user_id"), "apikey", ["user_id"], unique=False) - op.create_foreign_key(None, "apikey", "user", ["user_id"], ["id"]) + with contextlib.suppress(sa.exc.OperationalError): op.drop_column("apikey", "create_at") - op.add_column( - "flow", sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False) - ) - op.create_index(op.f("ix_flow_user_id"), "flow", ["user_id"], unique=False) - op.create_foreign_key(None, "flow", "user", ["user_id"], ["id"]) + with contextlib.suppress(sa.exc.OperationalError): + op.add_column( + "flow", sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False) + ) + with contextlib.suppress(sa.exc.OperationalError): + op.create_index(op.f("ix_flow_user_id"), "flow", ["user_id"], unique=False) + op.create_foreign_key(None, "flow", "user", ["user_id"], ["id"]) # ### end Alembic commands ### From 2af4508e5e51f4de542b295bb3e9d41143aa37be Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 16:28:56 -0300 Subject: [PATCH 123/134] =?UTF-8?q?=E2=9C=A8=20feat(main.py):=20add=20heal?= =?UTF-8?q?th=20endpoint=20to=20check=20the=20status=20of=20the=20applicat?= =?UTF-8?q?ion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/main.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/backend/langflow/main.py b/src/backend/langflow/main.py index a383a2afa..d0d62a804 100644 --- a/src/backend/langflow/main.py +++ b/src/backend/langflow/main.py @@ -31,6 +31,10 @@ def create_app(): allow_headers=["*"], ) + @app.get("/health") + def health(): + return {"status": "ok"} + app.include_router(router) app.on_event("startup")(initialize_services) From 132642347f41d981f1c3493b8332f9e57c53d624 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 16:29:15 -0300 Subject: [PATCH 124/134] =?UTF-8?q?=F0=9F=94=A7=20fix(endpoints.py):=20add?= =?UTF-8?q?=20current=5Fuser=20dependency=20to=20get=5Fall=20endpoint=20to?= =?UTF-8?q?=20enforce=20authentication=20and=20authorization=20?= =?UTF-8?q?=F0=9F=9A=80=20feat(endpoints.py):=20import=20User=20model=20an?= =?UTF-8?q?d=20get=5Fcurrent=5Factive=5Fuser=20function=20to=20enable=20au?= =?UTF-8?q?thentication=20and=20authorization=20in=20get=5Fall=20endpoint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/endpoints.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/api/v1/endpoints.py b/src/backend/langflow/api/v1/endpoints.py index 46acd4683..088c00b13 100644 --- a/src/backend/langflow/api/v1/endpoints.py +++ b/src/backend/langflow/api/v1/endpoints.py @@ -1,9 +1,11 @@ from http import HTTPStatus from typing import Annotated, Optional, Union +from langflow.services.auth.utils import get_current_active_user from langflow.services.cache.utils import save_uploaded_file from langflow.services.database.models.flow import Flow from langflow.processing.process import process_graph_cached, process_tweaks +from langflow.services.database.models.user.user import User from langflow.services.utils import get_settings_manager from langflow.utils.logger import logger from fastapi import APIRouter, Depends, HTTPException, UploadFile, Body @@ -33,7 +35,7 @@ router = APIRouter(tags=["Base"]) @router.get("/all") -def get_all(): +def get_all(current_user: User = Depends(get_current_active_user)): logger.debug("Building langchain types dict") native_components = build_langchain_types_dict() # custom_components is a list of dicts From 89ea8e45f6e0051a90cb3db67cb09f486a93eaae Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 16:29:24 -0300 Subject: [PATCH 125/134] =?UTF-8?q?=F0=9F=94=A7=20chore(login.py):=20impor?= =?UTF-8?q?t=20get=5Fcurrent=5Factive=5Fuser=20function=20to=20improve=20c?= =?UTF-8?q?ode=20readability=20and=20maintainability=20=E2=9C=A8=20feat(lo?= =?UTF-8?q?gin.py):=20add=20current=5Fuser=20dependency=20to=20refresh=5Ft?= =?UTF-8?q?oken=20endpoint=20to=20ensure=20only=20authenticated=20users=20?= =?UTF-8?q?can=20refresh=20their=20tokens?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/login.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/backend/langflow/api/v1/login.py b/src/backend/langflow/api/v1/login.py index fc6d0444d..afe67a916 100644 --- a/src/backend/langflow/api/v1/login.py +++ b/src/backend/langflow/api/v1/login.py @@ -9,6 +9,7 @@ from langflow.services.auth.utils import ( create_user_tokens, create_refresh_token, create_user_longterm_token, + get_current_active_user, ) from langflow.services.utils import get_settings_manager @@ -49,7 +50,9 @@ async def auto_login(db: Session = Depends(get_session)): @router.post("/refresh") -async def refresh_token(token: str): +async def refresh_token( + token: str, current_user: Session = Depends(get_current_active_user) +): if token: return create_refresh_token(token) else: From e2122567bed9cb2ffe920e1aa5be9e68772f22d6 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 16:29:34 -0300 Subject: [PATCH 126/134] =?UTF-8?q?=F0=9F=90=9B=20fix(base.py):=20remove?= =?UTF-8?q?=20unnecessary=20user=5Fid=20parameter=20from=20=5Fbuild=5Feach?= =?UTF-8?q?=5Fnode=5Fin=5Fparams=5Fdict()=20method=20call=20in=20Vertex=20?= =?UTF-8?q?class?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/graph/vertex/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/langflow/graph/vertex/base.py b/src/backend/langflow/graph/vertex/base.py index ade10365b..09c813a2e 100644 --- a/src/backend/langflow/graph/vertex/base.py +++ b/src/backend/langflow/graph/vertex/base.py @@ -138,7 +138,7 @@ class Vertex: Initiate the build process. """ logger.debug(f"Building {self.vertex_type}") - self._build_each_node_in_params_dict(user_id) + self._build_each_node_in_params_dict() self._get_and_instantiate_class(user_id) self._validate_built_object() From aa633ff2ded39bcc94b75ccfeb34e973a60cddd1 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 16:29:43 -0300 Subject: [PATCH 127/134] =?UTF-8?q?=F0=9F=90=9B=20fix(utils.py):=20change?= =?UTF-8?q?=20auth=5Fscheme=5Fdependency=20function=20to=20be=20async=20to?= =?UTF-8?q?=20match=20its=20usage=20in=20get=5Fcurrent=5Fuser=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/services/auth/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/services/auth/utils.py b/src/backend/langflow/services/auth/utils.py index 8cc67d216..3e9f0f582 100644 --- a/src/backend/langflow/services/auth/utils.py +++ b/src/backend/langflow/services/auth/utils.py @@ -14,12 +14,12 @@ from langflow.services.utils import get_session, get_settings_manager from sqlmodel import Session -def auth_scheme_dependency(request: Request): +async def auth_scheme_dependency(request: Request): settings_manager = ( get_settings_manager() ) # Assuming get_settings_manager is defined - return AuthManager(settings_manager).run_oauth2_scheme(request) + return await AuthManager(settings_manager).run_oauth2_scheme(request) async def get_current_user( From 1364fa0e0f7b70b6f06036e547ae3e14d5d49092 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 16:29:51 -0300 Subject: [PATCH 128/134] =?UTF-8?q?=F0=9F=94=A7=20chore(conftest.py):=20ch?= =?UTF-8?q?ange=20scope=20of=20client=20fixture=20to=20module=20and=20add?= =?UTF-8?q?=20autouse=3DTrue=20to=20ensure=20it=20is=20automatically=20use?= =?UTF-8?q?d=20by=20all=20tests=20in=20the=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 1359664a0..d0829d0c8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -45,7 +45,7 @@ async def async_client() -> AsyncGenerator: # Create client fixture for FastAPI -@pytest.fixture(scope="module") +@pytest.fixture(scope="module", autouse=True) def client(): from langflow.main import create_app From 812864eded52304ab4d19734e17ce63d9d338d17 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 16:30:01 -0300 Subject: [PATCH 129/134] =?UTF-8?q?=F0=9F=94=A7=20fix(test=5Fagents=5Ftemp?= =?UTF-8?q?late.py):=20update=20test=20functions=20to=20include=20logged?= =?UTF-8?q?=5Fin=5Fheaders=20parameter=20to=20test=20authenticated=20reque?= =?UTF-8?q?sts=20=F0=9F=94=A7=20fix(test=5Fchains=5Ftemplate.py):=20update?= =?UTF-8?q?=20test=20functions=20to=20include=20logged=5Fin=5Fheaders=20pa?= =?UTF-8?q?rameter=20to=20test=20authenticated=20requests=20=F0=9F=94=A7?= =?UTF-8?q?=20fix(test=5Fendpoints.py):=20update=20test=5Fget=5Fall=20func?= =?UTF-8?q?tion=20to=20include=20logged=5Fin=5Fheaders=20parameter=20to=20?= =?UTF-8?q?test=20authenticated=20requests=20=F0=9F=94=A7=20fix(test=5Fllm?= =?UTF-8?q?s=5Ftemplate.py):=20update=20test=20functions=20to=20include=20?= =?UTF-8?q?logged=5Fin=5Fheaders=20parameter=20to=20test=20authenticated?= =?UTF-8?q?=20requests=20=F0=9F=94=A7=20fix(test=5Fprompts=5Ftemplate.py):?= =?UTF-8?q?=20update=20test=20functions=20to=20include=20logged=5Fin=5Fhea?= =?UTF-8?q?ders=20parameter=20to=20test=20authenticated=20requests=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(test=5Fvectorstore=5Ftemplate.py):=20update?= =?UTF-8?q?=20test=20functions=20to=20include=20logged=5Fin=5Fheaders=20pa?= =?UTF-8?q?rameter=20to=20test=20authenticated=20requests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_agents_template.py | 16 +++++++-------- tests/test_chains_template.py | 32 +++++++++++++++--------------- tests/test_endpoints.py | 4 ++-- tests/test_llms_template.py | 12 +++++------ tests/test_prompts_template.py | 8 ++++---- tests/test_vectorstore_template.py | 4 ++-- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/tests/test_agents_template.py b/tests/test_agents_template.py index 0b5fb7c3a..b12ad7dee 100644 --- a/tests/test_agents_template.py +++ b/tests/test_agents_template.py @@ -1,8 +1,8 @@ from fastapi.testclient import TestClient -def test_zero_shot_agent(client: TestClient): - response = client.get("api/v1/all") +def test_zero_shot_agent(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() agents = json_response["agents"] @@ -113,8 +113,8 @@ def test_zero_shot_agent(client: TestClient): } -def test_json_agent(client: TestClient): - response = client.get("api/v1/all") +def test_json_agent(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() agents = json_response["agents"] @@ -152,8 +152,8 @@ def test_json_agent(client: TestClient): } -def test_csv_agent(client: TestClient): - response = client.get("api/v1/all") +def test_csv_agent(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() agents = json_response["agents"] @@ -195,8 +195,8 @@ def test_csv_agent(client: TestClient): } -def test_initialize_agent(client: TestClient): - response = client.get("api/v1/all") +def test_initialize_agent(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() agents = json_response["agents"] diff --git a/tests/test_chains_template.py b/tests/test_chains_template.py index 4339dbe3b..eb20a0571 100644 --- a/tests/test_chains_template.py +++ b/tests/test_chains_template.py @@ -1,8 +1,8 @@ from fastapi.testclient import TestClient -# def test_chains_settings(client: TestClient): -# response = client.get("api/v1/all") +# def test_chains_settings(client: TestClient, logged_in_headers): +# response = client.get("api/v1/all", headers=logged_in_headers) # assert response.status_code == 200 # json_response = response.json() # chains = json_response["chains"] @@ -10,8 +10,8 @@ from fastapi.testclient import TestClient # Test the ConversationChain object -def test_conversation_chain(client: TestClient): - response = client.get("api/v1/all") +def test_conversation_chain(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() chains = json_response["chains"] @@ -102,8 +102,8 @@ def test_conversation_chain(client: TestClient): ) -def test_llm_chain(client: TestClient): - response = client.get("api/v1/all") +def test_llm_chain(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() chains = json_response["chains"] @@ -173,8 +173,8 @@ def test_llm_chain(client: TestClient): } -def test_llm_checker_chain(client: TestClient): - response = client.get("api/v1/all") +def test_llm_checker_chain(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() chains = json_response["chains"] @@ -207,8 +207,8 @@ def test_llm_checker_chain(client: TestClient): assert chain["description"] == "" -def test_llm_math_chain(client: TestClient): - response = client.get("api/v1/all") +def test_llm_math_chain(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() chains = json_response["chains"] @@ -299,8 +299,8 @@ def test_llm_math_chain(client: TestClient): ) -def test_series_character_chain(client: TestClient): - response = client.get("api/v1/all") +def test_series_character_chain(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() chains = json_response["chains"] @@ -367,8 +367,8 @@ def test_series_character_chain(client: TestClient): ) -def test_mid_journey_prompt_chain(client: TestClient): - response = client.get("api/v1/all") +def test_mid_journey_prompt_chain(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() chains = json_response["chains"] @@ -408,8 +408,8 @@ def test_mid_journey_prompt_chain(client: TestClient): ) -def test_time_travel_guide_chain(client: TestClient): - response = client.get("api/v1/all") +def test_time_travel_guide_chain(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() chains = json_response["chains"] diff --git a/tests/test_endpoints.py b/tests/test_endpoints.py index 045af1ba5..431999a0c 100644 --- a/tests/test_endpoints.py +++ b/tests/test_endpoints.py @@ -83,8 +83,8 @@ PROMPT_REQUEST = { } -def test_get_all(client: TestClient): - response = client.get("api/v1/all") +def test_get_all(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() # We need to test the custom nodes diff --git a/tests/test_llms_template.py b/tests/test_llms_template.py index f1b76e18e..c082baded 100644 --- a/tests/test_llms_template.py +++ b/tests/test_llms_template.py @@ -2,9 +2,9 @@ from fastapi.testclient import TestClient from langflow.services.utils import get_settings_manager -def test_llms_settings(client: TestClient): +def test_llms_settings(client: TestClient, logged_in_headers): settings_manager = get_settings_manager() - response = client.get("api/v1/all") + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() llms = json_response["llms"] @@ -103,8 +103,8 @@ def test_llms_settings(client: TestClient): # } -def test_openai(client: TestClient): - response = client.get("api/v1/all") +def test_openai(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() language_models = json_response["llms"] @@ -369,8 +369,8 @@ def test_openai(client: TestClient): } -def test_chat_open_ai(client: TestClient): - response = client.get("api/v1/all") +def test_chat_open_ai(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() language_models = json_response["llms"] diff --git a/tests/test_prompts_template.py b/tests/test_prompts_template.py index dde313c20..676448f73 100644 --- a/tests/test_prompts_template.py +++ b/tests/test_prompts_template.py @@ -2,17 +2,17 @@ from fastapi.testclient import TestClient from langflow.services.utils import get_settings_manager -def test_prompts_settings(client: TestClient): +def test_prompts_settings(client: TestClient, logged_in_headers): settings_manager = get_settings_manager() - response = client.get("api/v1/all") + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() prompts = json_response["prompts"] assert set(prompts.keys()) == set(settings_manager.settings.PROMPTS) -def test_prompt_template(client: TestClient): - response = client.get("api/v1/all") +def test_prompt_template(client: TestClient, logged_in_headers): + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() prompts = json_response["prompts"] diff --git a/tests/test_vectorstore_template.py b/tests/test_vectorstore_template.py index 4baa7f4b6..87394b890 100644 --- a/tests/test_vectorstore_template.py +++ b/tests/test_vectorstore_template.py @@ -4,9 +4,9 @@ from langflow.services.utils import get_settings_manager # check that all agents are in settings.agents # are in json_response["agents"] -def test_vectorstores_settings(client: TestClient): +def test_vectorstores_settings(client: TestClient, logged_in_headers): settings_manager = get_settings_manager() - response = client.get("api/v1/all") + response = client.get("api/v1/all", headers=logged_in_headers) assert response.status_code == 200 json_response = response.json() vectorstores = json_response["vectorstores"] From a290a6860553bce9b7ca28a94a07c6d32705a0dd Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 16:30:16 -0300 Subject: [PATCH 130/134] =?UTF-8?q?=F0=9F=94=A7=20chore(update=5Fall=5Ftab?= =?UTF-8?q?les.py):=20remove=20unused=20code=20block=20to=20improve=20code?= =?UTF-8?q?=20readability=20and=20maintainability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py b/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py index f45034d40..e8f59089c 100644 --- a/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py +++ b/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py @@ -39,7 +39,6 @@ def upgrade() -> None: op.add_column( "flow", sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False) ) - with contextlib.suppress(sa.exc.OperationalError): op.create_index(op.f("ix_flow_user_id"), "flow", ["user_id"], unique=False) op.create_foreign_key(None, "flow", "user", ["user_id"], ["id"]) # ### end Alembic commands ### From fc32ee63e17258bfa25119c7faadcc08a9045b47 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 16:31:24 -0300 Subject: [PATCH 131/134] =?UTF-8?q?=F0=9F=90=9B=20fix(alembic):=20change?= =?UTF-8?q?=20"user=5Fid"=20column=20in=20"flow"=20table=20to=20be=20nulla?= =?UTF-8?q?ble=20to=20handle=20existing=20data=20without=20a=20user=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py b/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py index e8f59089c..27664d8b7 100644 --- a/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py +++ b/src/backend/langflow/alembic/versions/d3749cf7ac7e_update_all_tables.py @@ -37,7 +37,7 @@ def upgrade() -> None: op.drop_column("apikey", "create_at") with contextlib.suppress(sa.exc.OperationalError): op.add_column( - "flow", sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False) + "flow", sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=True) ) op.create_index(op.f("ix_flow_user_id"), "flow", ["user_id"], unique=False) op.create_foreign_key(None, "flow", "user", ["user_id"], ["id"]) From 4e1710bcc7d0ba766e3ce558928e8ab7c0edd0a7 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 17:01:32 -0300 Subject: [PATCH 132/134] =?UTF-8?q?=F0=9F=90=9B=20fix(chat.py):=20add=20mi?= =?UTF-8?q?ssing=20import=20statement=20for=20Query=20from=20fastapi=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(chat.py):=20add=20missing=20import=20stateme?= =?UTF-8?q?nt=20for=20Session=20from=20sqlmodel=20=F0=9F=90=9B=20fix(chat.?= =?UTF-8?q?py):=20add=20missing=20import=20statement=20for=20get=5Fsession?= =?UTF-8?q?=20from=20langflow.services.utils=20=F0=9F=90=9B=20fix(chat.py)?= =?UTF-8?q?:=20add=20missing=20import=20statement=20for=20get=5Fcurrent=5F?= =?UTF-8?q?user=20from=20langflow.services.auth.utils=20=F0=9F=90=9B=20fix?= =?UTF-8?q?(chat.py):=20add=20missing=20import=20statement=20for=20HTTPExc?= =?UTF-8?q?eption=20from=20fastapi=20=F0=9F=90=9B=20fix(chat.py):=20add=20?= =?UTF-8?q?missing=20import=20statement=20for=20get=5Fcurrent=5Factive=5Fu?= =?UTF-8?q?ser=20from=20langflow.services.auth.utils=20=F0=9F=90=9B=20fix(?= =?UTF-8?q?chat.py):=20add=20missing=20import=20statement=20for=20WebSocke?= =?UTF-8?q?t=20from=20fastapi=20=F0=9F=90=9B=20fix(chat.py):=20add=20missi?= =?UTF-8?q?ng=20import=20statement=20for=20WebSocketException=20from=20fas?= =?UTF-8?q?tapi=20=F0=9F=90=9B=20fix(chat.py):=20add=20missing=20import=20?= =?UTF-8?q?statement=20for=20status=20from=20fastapi=20=F0=9F=90=9B=20fix(?= =?UTF-8?q?chat.py):=20add=20missing=20import=20statement=20for=20APIRoute?= =?UTF-8?q?r=20from=20fastapi=20=F0=9F=90=9B=20fix(chat.py):=20add=20missi?= =?UTF-8?q?ng=20import=20statement=20for=20Depends=20from=20fastapi=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(chat.py):=20add=20missing=20import=20stateme?= =?UTF-8?q?nt=20for=20HTTPException=20from=20fastapi=20=F0=9F=90=9B=20fix(?= =?UTF-8?q?chat.py):=20add=20missing=20import=20statement=20for=20get=5Fcu?= =?UTF-8?q?rrent=5Factive=5Fuser=20from=20langflow.services.auth.utils=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(chat.py):=20add=20missing=20import=20stateme?= =?UTF-8?q?nt=20for=20get=5Fcurrent=5Fuser=20from=20langflow.services.auth?= =?UTF-8?q?.utils=20=F0=9F=90=9B=20fix(chat.py):=20add=20missing=20import?= =?UTF-8?q?=20statement=20for=20get=5Fsession=20from=20langflow.services.u?= =?UTF-8?q?tils=20=F0=9F=90=9B=20fix(chat.py):=20add=20missing=20import=20?= =?UTF-8?q?statement=20for=20Session=20from=20sqlmodel=20=F0=9F=90=9B=20fi?= =?UTF-8?q?x(chat.py):=20add=20missing=20import=20statement=20for=20HTTPEx?= =?UTF-8?q?ception=20from=20fastapi=20=F0=9F=90=9B=20fix(chat.py):=20add?= =?UTF-8?q?=20missing=20import=20statement=20for=20get=5Fcurrent=5Fuser=20?= =?UTF-8?q?from=20langflow.services.auth.utils=20=F0=9F=90=9B=20fix(chat.p?= =?UTF-8?q?y):=20add=20missing=20import=20statement=20for=20HTTPException?= =?UTF-8?q?=20from=20fastapi=20=F0=9F=90=9B=20fix(chat.py):=20add=20missin?= =?UTF-8?q?g=20import=20statement=20for=20get=5Fcurrent=5Fuser=20from=20la?= =?UTF-8?q?ngflow.services.auth.utils=20=F0=9F=90=9B=20fix(chat.py):=20add?= =?UTF-8?q?=20missing=20import=20statement=20for=20HTTPException=20from=20?= =?UTF-8?q?fastapi=20=F0=9F=90=9B=20fix(chat.py):=20add=20missing=20import?= =?UTF-8?q?=20statement=20for=20get=5Fcurrent=5Fuser=20from=20langflow.ser?= =?UTF-8?q?vices.auth.utils=20=F0=9F=90=9B=20fix(chat.py):=20add=20missing?= =?UTF-8?q?=20import=20statement=20for=20HTTPException=20from=20fastapi=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(chat.py):=20add=20missing=20import=20stateme?= =?UTF-8?q?nt=20for=20get=5Fcurrent=5Fuser=20from=20langflow.services.auth?= =?UTF-8?q?.utils=20=F0=9F=90=9B=20fix(chat.py):=20add=20missing=20import?= =?UTF-8?q?=20statement=20for=20HTTPException=20from=20fastapi=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(chat.py):=20add=20missing=20import=20stateme?= =?UTF-8?q?nt=20for=20get=5Fcurrent=5Fuser=20from=20langflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/chat.py | 13 +++++++++++-- tests/test_websocket.py | 13 +++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/backend/langflow/api/v1/chat.py b/src/backend/langflow/api/v1/chat.py index 459abcf51..83d85b719 100644 --- a/src/backend/langflow/api/v1/chat.py +++ b/src/backend/langflow/api/v1/chat.py @@ -2,6 +2,7 @@ from fastapi import ( APIRouter, Depends, HTTPException, + Query, WebSocket, WebSocketException, status, @@ -12,9 +13,11 @@ from langflow.api.v1.schemas import BuildStatus, BuiltResponse, InitResponse, St from langflow.services import service_manager, ServiceType from langflow.graph.graph.base import Graph -from langflow.services.auth.utils import get_current_active_user +from langflow.services.auth.utils import get_current_active_user, get_current_user +from langflow.services.utils import get_session from langflow.utils.logger import logger from cachetools import LRUCache +from sqlmodel import Session router = APIRouter(tags=["Chat"]) @@ -23,10 +26,16 @@ flow_data_store: LRUCache = LRUCache(maxsize=10) @router.websocket("/chat/{client_id}") async def chat( - client_id: str, websocket: WebSocket, current_user=Depends(get_current_active_user) + client_id: str, + websocket: WebSocket, + token: str = Query(...), + db: Session = Depends(get_session), ): """Websocket endpoint for chat.""" try: + user = await get_current_user(token, db) + if not user.is_active: + raise HTTPException(status_code=401, detail="Invalid token") chat_manager = service_manager.get(ServiceType.CHAT_MANAGER) if client_id in chat_manager.in_memory_cache: await chat_manager.handle_websocket(client_id, websocket) diff --git a/tests/test_websocket.py b/tests/test_websocket.py index dd668c287..16f9eff05 100644 --- a/tests/test_websocket.py +++ b/tests/test_websocket.py @@ -1,13 +1,16 @@ from fastapi import WebSocketDisconnect +from fastapi.testclient import TestClient # from langflow.services.chat.manager import ChatManager import pytest -def test_init_build(client): +def test_init_build(client, active_user, logged_in_headers): response = client.post( - "api/v1/build/init/test", json={"id": "test", "data": {"key": "value"}} + "api/v1/build/init/test", + json={"id": "test", "data": {"key": "value"}}, + headers=logged_in_headers, ) assert response.status_code == 201 assert response.json() == {"flowId": "test"} @@ -24,10 +27,12 @@ def test_init_build(client): # assert response.headers["content-type"] == "text/event-stream; charset=utf-8" -def test_websocket_endpoint(client): +def test_websocket_endpoint(client: TestClient, active_user, logged_in_headers): + # Assuming your websocket_endpoint uses chat_manager which caches data from stream_build + access_token = logged_in_headers["Authorization"].split(" ")[1] with pytest.raises(WebSocketDisconnect): with client.websocket_connect( - "api/v1/chat/non_existing_client_id" + f"api/v1/chat/non_existing_client_id?token={access_token}" ) as websocket: websocket.send_json({"type": "test"}) data = websocket.receive_json() From 17cbc64273545086869e7ad273bb40047b5ca61d Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Fri, 25 Aug 2023 17:17:09 -0300 Subject: [PATCH 133/134] update browser route context location --- src/frontend/src/contexts/index.tsx | 3 +++ src/frontend/src/index.tsx | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/contexts/index.tsx b/src/frontend/src/contexts/index.tsx index 64142f942..acc7f4070 100644 --- a/src/frontend/src/contexts/index.tsx +++ b/src/frontend/src/contexts/index.tsx @@ -9,11 +9,13 @@ import { LocationProvider } from "./locationContext"; import { TabsProvider } from "./tabsContext"; import { TypesProvider } from "./typesContext"; import { UndoRedoProvider } from "./undoRedoContext"; +import { BrowserRouter } from "react-router-dom"; export default function ContextWrapper({ children }: { children: ReactNode }) { //element to wrap all context return ( <> + @@ -33,6 +35,7 @@ export default function ContextWrapper({ children }: { children: ReactNode }) { + ); } diff --git a/src/frontend/src/index.tsx b/src/frontend/src/index.tsx index 2542f4903..db196080b 100644 --- a/src/frontend/src/index.tsx +++ b/src/frontend/src/index.tsx @@ -17,10 +17,8 @@ const root = ReactDOM.createRoot( ); root.render( - - ); reportWebVitals(); From d2f5a5d56480373acf0654a5bee15f1461b41902 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Fri, 25 Aug 2023 17:21:54 -0300 Subject: [PATCH 134/134] moved api interceptor --- src/frontend/src/contexts/index.tsx | 2 ++ src/frontend/src/controllers/API/api.tsx | 1 - src/frontend/src/index.tsx | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/contexts/index.tsx b/src/frontend/src/contexts/index.tsx index acc7f4070..b213ace9d 100644 --- a/src/frontend/src/contexts/index.tsx +++ b/src/frontend/src/contexts/index.tsx @@ -10,6 +10,7 @@ import { TabsProvider } from "./tabsContext"; import { TypesProvider } from "./typesContext"; import { UndoRedoProvider } from "./undoRedoContext"; import { BrowserRouter } from "react-router-dom"; +import { ApiInterceptor } from "../controllers/API/api"; export default function ContextWrapper({ children }: { children: ReactNode }) { //element to wrap all context @@ -23,6 +24,7 @@ export default function ContextWrapper({ children }: { children: ReactNode }) { + {children} diff --git a/src/frontend/src/controllers/API/api.tsx b/src/frontend/src/controllers/API/api.tsx index fc4358ed0..0e74670b0 100644 --- a/src/frontend/src/controllers/API/api.tsx +++ b/src/frontend/src/controllers/API/api.tsx @@ -24,7 +24,6 @@ function ApiInterceptor() { async (error: AxiosError) => { if (error.response?.status === 401) { const refreshToken = cookies.get("refresh_token"); - if (refreshToken) { authenticationErrorCount = authenticationErrorCount + 1; if (authenticationErrorCount > 3) { diff --git a/src/frontend/src/index.tsx b/src/frontend/src/index.tsx index db196080b..3a7cbd9f5 100644 --- a/src/frontend/src/index.tsx +++ b/src/frontend/src/index.tsx @@ -18,7 +18,6 @@ const root = ReactDOM.createRoot( root.render( - ); reportWebVitals();