CLI CI 2

.github/workflows/_test.yml

@@ -44,14 +44,6 @@ jobs:
         shell: bash
         run: make test
 
-      - name: Install integration dependencies
-        shell: bash
-        run: poetry install --with=test_integration
-
-      - name: Check integration tests compile
-        shell: bash
-        run: poetry run pytest -m compile tests/integration_tests
-
       - name: Ensure the tests did not create any additional files
         shell: bash
         run: |

.github/workflows/langchain_cli_ci.yml

@@ -0,0 +1,53 @@
+---
+name: libs/cli CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    paths:
+      - '.github/actions/poetry_setup/action.yml'
+      - '.github/tools/**'
+      - '.github/workflows/_lint.yml'
+      - '.github/workflows/_test.yml'
+      - '.github/workflows/_pydantic_compatibility.yml'
+      - '.github/workflows/langchain_cli_ci.yml'
+      - 'libs/cli/**'
+      - 'libs/*'
+  workflow_dispatch:  # Allows to trigger the workflow manually in GitHub UI
+
+# If another push to the same PR or branch happens while this workflow is still running,
+# cancel the earlier run in favor of the next run.
+#
+# There's no point in testing an outdated version of the code. GitHub only allows
+# a limited number of job runners to be active at the same time, so it's better to cancel
+# pointless jobs early so that more useful jobs can run sooner.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  POETRY_VERSION: "1.6.1"
+  WORKDIR: "libs/cli"
+
+jobs:
+  lint:
+    uses:
+      ./.github/workflows/_lint.yml
+    with:
+      working-directory: libs/cli
+    secrets: inherit
+
+  test:
+    uses:
+      ./.github/workflows/_test.yml
+    with:
+      working-directory: libs/cli
+    secrets: inherit
+
+  pydantic-compatibility:
+    uses:
+      ./.github/workflows/_pydantic_compatibility.yml
+    with:
+      working-directory: libs/cli
+    secrets: inherit

libs/cli/Makefile

@@ -0,0 +1,8 @@
+lint lint_diff:
+	poetry run poe lint
+
+test:
+	poetry run poe test
+
+format:
+	poetry run poe format

libs/cli/langchain_cli/cli.py

@@ -1,10 +1,10 @@
-import typer
 import subprocess
 from typing import Optional
+
+import typer
 from typing_extensions import Annotated
 
-from langchain_cli.namespaces import hub
-from langchain_cli.namespaces import serve
+from langchain_cli.namespaces import hub, serve
 
 app = typer.Typer(no_args_is_help=True, add_completion=False)
 app.add_typer(hub.hub, name="hub", help=hub.__doc__)

libs/cli/langchain_cli/dev_scripts.py

@@ -4,6 +4,7 @@
 
 from fastapi import FastAPI
 from langserve.packages import add_package_route
+
 from langchain_cli.utils.packages import get_package_root
 
 

libs/cli/langchain_cli/namespaces/hub.py

@@ -2,13 +2,14 @@
 Manage installable hub packages.
 """
 
-import typer
-from typing import Optional
-from typing_extensions import Annotated
-from pathlib import Path
+import re
 import shutil
 import subprocess
-import re
+from pathlib import Path
+from typing import Optional
+
+import typer
+from typing_extensions import Annotated
 
 hub = typer.Typer(no_args_is_help=True, add_completion=False)
 

libs/cli/langchain_cli/namespaces/serve.py

@@ -2,21 +2,23 @@
 Manage LangServe application projects.
 """
 
-import typer
-from typing import Optional, List
-from typing_extensions import Annotated
-from pathlib import Path
 import shutil
 import subprocess
+from pathlib import Path
+from typing import List, Optional
+
+import tomli
+import typer
+from langserve.packages import get_langserve_export, list_packages
+from typing_extensions import Annotated
+
+from langchain_cli.utils.events import create_events
 from langchain_cli.utils.git import (
     copy_repo,
-    update_repo,
     parse_dependency_string,
+    update_repo,
 )
 from langchain_cli.utils.packages import get_package_root
-from langchain_cli.utils.events import create_events
-from langserve.packages import list_packages, get_langserve_export
-import tomli
 
 REPO_DIR = Path(typer.get_app_dir("langchain")) / "git_repos"
 
@@ -101,7 +103,8 @@ def add(
     if len(repo) != 0:
         if len(dependencies) != 0:
             raise typer.BadParameter(
-                "Cannot specify both repo and dependencies. Please specify one or the other."
+                "Cannot specify both repo and dependencies. "
+                "Please specify one or the other."
             )
         dependencies = [f"git+https://github.com/{r}" for r in repo]
 
@@ -144,7 +147,8 @@ def add(
         # detect name conflict
         if langserve_export["package_name"] in installed_names:
             typer.echo(
-                f"Package with name {langserve_export['package_name']} already installed. Skipping...",
+                f"Package with name {langserve_export['package_name']} already "
+                "installed. Skipping...",
             )
             continue
 
@@ -154,7 +158,8 @@ def add(
         destination_path = package_dir / inner_api_path
         if destination_path.exists():
             typer.echo(
-                f"Endpoint {langserve_export['package_name']} already exists. Skipping...",
+                f"Endpoint {langserve_export['package_name']} already exists. "
+                "Skipping...",
             )
             continue
         copy_repo(source_path, destination_path)

libs/cli/langchain_cli/package_template/package_template/chain.py

@@ -1,6 +1,5 @@
-from langchain.prompts import ChatPromptTemplate
 from langchain.chat_models import ChatOpenAI
-
+from langchain.prompts import ChatPromptTemplate
 
 _prompt = ChatPromptTemplate.from_messages(
     [

libs/cli/langchain_cli/utils/events.py

@@ -1,6 +1,7 @@
-import urllib3
 import json
-from typing import List, Dict, Any, Optional, TypedDict
+from typing import Any, Dict, List, Optional, TypedDict
+
+import urllib3
 
 WRITE_KEY = "310apTK0HUFl4AOv"
 

libs/cli/langchain_cli/utils/git.py

@@ -1,15 +1,16 @@
-from typing import Optional, TypedDict
+import hashlib
+import re
+import shutil
 from pathlib import Path
+from typing import Optional, TypedDict
+
+from git import Repo
 
-import shutil
-import re
 from langchain_cli.constants import (
+    DEFAULT_GIT_REF,
     DEFAULT_GIT_REPO,
     DEFAULT_GIT_SUBDIRECTORY,
-    DEFAULT_GIT_REF,
 )
-import hashlib
-from git import Repo
 
 
 class DependencySource(TypedDict):

libs/cli/langchain_cli/utils/packages.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Set, Optional
+from typing import Optional, Set
 
 
 def get_package_root(cwd: Optional[Path] = None) -> Path:

libs/cli/pyproject.toml

@@ -18,16 +18,30 @@ uvicorn = "^0.23.2"
 langchain = "langchain_cli.cli:app"
 langchain-cli = "langchain_cli.cli:app"
 
-
 [tool.poetry.group.dev.dependencies]
 poethepoet = "^0.24.1"
 pytest = "^7.4.2"
 pytest-watch = "^4.2.0"
 
+[tool.poetry.group.lint.dependencies]
+ruff = "^0.1.3"
+
+[tool.poetry.group.test.dependencies]
+
+[tool.poetry.group.typing.dependencies]
+
+[tool.ruff]
+select = [
+  "E",  # pycodestyle
+  "F",  # pyflakes
+  "I",  # isort
+]
+
 [tool.poe.tasks]
 test = "poetry run pytest"
 watch = "poetry run ptw"
 lint = "poetry run ruff ."
+format = "poetry run ruff . --fix"
 
 
 [build-system]

libs/cli/tests/test_utils.py

@@ -1,10 +1,11 @@
 import pytest
-from langchain_cli.utils.git import parse_dependency_string, DependencySource
+
 from langchain_cli.constants import (
+    DEFAULT_GIT_REF,
     DEFAULT_GIT_REPO,
     DEFAULT_GIT_SUBDIRECTORY,
-    DEFAULT_GIT_REF,
 )
+from langchain_cli.utils.git import DependencySource, parse_dependency_string
 
 
 def test_dependency_string() -> None: