Update Dockerfiles, main.py, constants.py, and package versions (#1691)

* Update Dockerfiles to include user creation and use --user flag for pip install

* Add JavaScriptMIMETypeMiddleware to main.py

* Update constants.py and run.py files

* Update package versions in poetry.lock and pyproject.toml files

* Refactor Dockerfile to optimize image building process

* Fix import error in main.py

* Update Dockerfiles to use logspace/langflow image

base.Dockerfile

@@ -63,8 +63,10 @@ RUN --mount=type=cache,target=/root/.cache \
 
 # copy project requirement files here to ensure they will be cached.
 WORKDIR $PYSETUP_PATH
+# Copy just one file to avoid rebuilding the whole image
 COPY poetry.lock pyproject.toml ./
-COPY ./src/backend/langflow/main.py ./src/backend/langflow/main.py
+COPY ./src/backend/langflow ./src/backend/langflow
+COPY ./src/backend/base/pyproject.toml ./src/backend/base/pyproject.toml
 # Copy README.md to the build context
 COPY README.md .
 # install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
@@ -84,7 +86,7 @@ COPY --from=builder-base $POETRY_HOME $POETRY_HOME
 COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
 
 # Copy just one file to avoid rebuilding the whole image
-COPY ./src/backend/langflow/__init__.py ./src/backend/langflow/__init__.py
+COPY ./src/backend/langflow ./src/backend/langflow
 # quicker install as runtime deps are already installed
 RUN --mount=type=cache,target=/root/.cache \
     poetry install --with=dev --extras deploy

deploy/docker-compose.yml

@@ -69,10 +69,7 @@ services:
         - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.middlewares=${STACK_NAME?Variable not set}-www-redirect,${STACK_NAME?Variable not set}-https-redirect
 
   backend: &backend
-    image: "ogabrielluiz/langflow:latest"
-    build:
-      context: ../
-      dockerfile: base.Dockerfile
+    image: "logspace/langflow:latest"
     depends_on:
       - db
       - broker
@@ -143,9 +140,6 @@ services:
     <<: *backend
     env_file:
       - .env
-    build:
-      context: ../
-      dockerfile: base.Dockerfile
     command: celery -A langflow.worker.celery_app worker --loglevel=INFO --concurrency=1 -n lf-worker@%h -P eventlet
     healthcheck:
       test: "exit 0"
@@ -158,9 +152,6 @@ services:
       - .env
     networks:
       - default
-    build:
-      context: ../
-      dockerfile: base.Dockerfile
     environment:
       - FLOWER_PORT=5555
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langflow"
-version = "1.0.0a19"
+version = "1.0.0a20"
 description = "A Python package with a built-in web application"
 authors = ["Logspace <[email protected]>"]
 maintainers = [

src/backend/base/langflow/alembic/versions/1a110b568907_replace_credential_table_with_variable.py

@@ -5,6 +5,7 @@
 Create Date: 2024-03-25 09:40:02.743453
 
 """
+
 from typing import Sequence, Union
 
 import sqlalchemy as sa

src/backend/base/langflow/alembic/versions/79e675cb6752_change_datetime_type.py

@@ -5,7 +5,7 @@
 Create Date: 2024-04-11 19:23:10.697335
 
 """
-from calendar import c
+
 from typing import Sequence, Union
 
 import sqlalchemy as sa

src/backend/base/langflow/base/constants.py

@@ -6,6 +6,7 @@
 - NODE_FORMAT_ATTRIBUTES: A list of attributes used for formatting nodes.
 - FIELD_FORMAT_ATTRIBUTES: A list of attributes used for formatting fields.
 """
+
 STREAM_INFO_TEXT = "Stream the response from the model. Streaming works only in Chat."
 
 NODE_FORMAT_ATTRIBUTES = ["beta", "icon", "display_name", "description"]

src/backend/base/langflow/interface/run.py

@@ -1,9 +1,5 @@
-from typing import Dict, Tuple
-
 from loguru import logger
 
-from langflow.graph import Graph
-
 
 def get_memory_key(langchain_object):
     """

src/backend/base/langflow/main.py

@@ -11,6 +11,7 @@
 from fastapi.staticfiles import StaticFiles
 from loguru import logger
 from rich import print as rprint
+from starlette.middleware.base import BaseHTTPMiddleware
 
 from langflow.api import router
 from langflow.initial_setup.setup import create_or_update_starter_projects
@@ -20,8 +21,16 @@
 from langflow.utils.logger import configure
 
 
+class JavaScriptMIMETypeMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request: Request, call_next):
+        response = await call_next(request)
+        if "files/" not in request.url.path and request.url.path.endswith(".js") and response.status_code == 200:
+            response.headers["Content-Type"] = "text/javascript"
+        return response
+
+
 def get_lifespan(fix_migration=False, socketio_server=None):
-    from langflow.version import __version__
+    from langflow.version import __version__  # type: ignore
 
     @asynccontextmanager
     async def lifespan(app: FastAPI):
@@ -62,6 +71,7 @@ def create_app():
         allow_methods=["*"],
         allow_headers=["*"],
     )
+    app.add_middleware(JavaScriptMIMETypeMiddleware)
 
     @app.middleware("http")
     async def flatten_query_string_lists(request: Request, call_next):

src/backend/base/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langflow-base"
-version = "0.0.31"
+version = "0.0.32"
 description = "A Python package with a built-in web application"
 authors = ["Logspace <[email protected]>"]
 maintainers = [

tests/conftest.py

@@ -19,7 +19,6 @@
 from langflow.services.database.models.user.model import User, UserCreate
 from langflow.services.database.utils import session_getter
 from langflow.services.deps import get_db_service
-from sqlmodel import Session, SQLModel, create_engine, select
 from sqlmodel.pool import StaticPool
 from typer.testing import CliRunner