From d92978018333f724ea10b341f313c1b68f56aa1f Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 6 Jun 2024 13:18:56 -0700 Subject: [PATCH] Update dependencies and fix import paths (#2101) * chore: Update dependencies and build frontend in Dockerfile * chore: Update lodash import and fix import paths * chore: Update Dockerfile to remove unnecessary frontend build step --- docker/build_and_push.Dockerfile | 1 - .../components/vectorsearch/__init__.py | 27 ------------------- .../src/customNodes/genericNode/index.tsx | 2 +- .../components/PageComponent/index.tsx | 2 +- src/frontend/src/utils/reactflowUtils.ts | 2 +- 5 files changed, 3 insertions(+), 31 deletions(-) diff --git a/docker/build_and_push.Dockerfile b/docker/build_and_push.Dockerfile index cabc1a753..bd177e9bc 100644 --- a/docker/build_and_push.Dockerfile +++ b/docker/build_and_push.Dockerfile @@ -47,7 +47,6 @@ WORKDIR /app COPY pyproject.toml poetry.lock README.md ./ COPY src/ ./src COPY scripts/ ./scripts - RUN python -m pip install requests --user && cd ./scripts && python update_dependencies.py RUN $POETRY_HOME/bin/poetry lock --no-update \ && $POETRY_HOME/bin/poetry install --no-interaction --no-ansi -E deploy \ diff --git a/src/backend/base/langflow/components/vectorsearch/__init__.py b/src/backend/base/langflow/components/vectorsearch/__init__.py index 83ce34b26..e69de29bb 100644 --- a/src/backend/base/langflow/components/vectorsearch/__init__.py +++ b/src/backend/base/langflow/components/vectorsearch/__init__.py @@ -1,27 +0,0 @@ -from .AstraDBSearch import AstraDBSearchComponent -from .ChromaSearch import ChromaSearchComponent -from .FAISSSearch import FAISSSearchComponent -from .MongoDBAtlasVectorSearch import MongoDBAtlasSearchComponent -from .PineconeSearch import PineconeSearchComponent -from .QdrantSearch import QdrantSearchComponent -from .RedisSearch import RedisSearchComponent -from .SupabaseVectorStoreSearch import SupabaseSearchComponent -from .VectaraSearch import VectaraSearchComponent -from .WeaviateSearch import WeaviateSearchVectorStore -from .pgvectorSearch import PGVectorSearchComponent -from .Couchbase import CouchbaseSearchComponent # type: ignore - -__all__ = [ - "AstraDBSearchComponent", - "ChromaSearchComponent", - "CouchbaseSearchComponent", - "FAISSSearchComponent", - "MongoDBAtlasSearchComponent", - "PineconeSearchComponent", - "QdrantSearchComponent", - "RedisSearchComponent", - "SupabaseSearchComponent", - "VectaraSearchComponent", - "WeaviateSearchVectorStore", - "PGVectorSearchComponent", -] diff --git a/src/frontend/src/customNodes/genericNode/index.tsx b/src/frontend/src/customNodes/genericNode/index.tsx index 5f145d523..ba0d1c9a6 100644 --- a/src/frontend/src/customNodes/genericNode/index.tsx +++ b/src/frontend/src/customNodes/genericNode/index.tsx @@ -1,5 +1,5 @@ -import { cloneDeep } from "lodash"; import emojiRegex from "emoji-regex"; +import { cloneDeep } from "lodash"; import { useCallback, useEffect, useMemo, useState } from "react"; import { NodeToolbar, useUpdateNodeInternals } from "reactflow"; import IconComponent from "../../components/genericIconComponent"; diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx index c84c6e405..eb94a7fde 100644 --- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx @@ -11,13 +11,13 @@ import ReactFlow, { SelectionDragHandler, updateEdge, } from "reactflow"; +import GenericNode from "../../../../CustomNodes/GenericNode"; import { INVALID_SELECTION_ERROR_ALERT, UPLOAD_ALERT_LIST, UPLOAD_ERROR_ALERT, WRONG_FILE_ERROR_ALERT, } from "../../../../constants/alerts_constants"; -import GenericNode from "../../../../customNodes/genericNode"; import useAlertStore from "../../../../stores/alertStore"; import useFlowStore from "../../../../stores/flowStore"; import useFlowsManagerStore from "../../../../stores/flowsManagerStore"; diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts index d1f960017..62e87c50b 100644 --- a/src/frontend/src/utils/reactflowUtils.ts +++ b/src/frontend/src/utils/reactflowUtils.ts @@ -8,6 +8,7 @@ import { XYPosition, } from "reactflow"; import ShortUniqueId from "short-unique-id"; +import getFieldTitle from "../CustomNodes/utils/get-field-title"; import { INPUT_TYPES, LANGFLOW_SUPPORTED_TYPES, @@ -16,7 +17,6 @@ import { specialCharsRegex, } from "../constants/constants"; import { downloadFlowsFromDatabase } from "../controllers/API"; -import getFieldTitle from "../customNodes/utils/get-field-title"; import { DESCRIPTIONS } from "../flow_constants"; import { APIClassType,