langgraph-cli 0.1.0__tar.gz → 0.1.2__tar.gz

{langgraph_cli-0.1.0 → langgraph_cli-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langgraph-cli
-Version: 0.1.0
+Version: 0.1.2
 Summary: 
 Author: Nuno Campos
 Author-email: nuno@langchain.dev

{langgraph_cli-0.1.0 → langgraph_cli-0.1.2}/langgraph_cli/cli.py

@@ -67,8 +67,9 @@ async def gather(*coros: Coroutine):
 
 
 OPT_O = click.option(
-    "--override",
-    "-o",
+    "--docker-compose",
+    "-d",
+    help="Advanced: Path to docker-compose.yml file with additional services to launch",
     type=click.Path(
         exists=True,
         file_okay=True,
@@ -80,6 +81,23 @@ OPT_O = click.option(
 OPT_C = click.option(
     "--config",
     "-c",
+    help="""Path to configuration file declaring dependencies, graphs and environment variables.
+    
+    \b
+    Example:
+    {
+        "dependencies": [
+            "langchain_openai",
+            "./your_package"
+        ],
+        "graphs": {
+            "my_graph_id": "./your_package/your_file.py:variable"
+        },
+        "env": "./.env"
+    }
+
+    Defaults to looking for langgraph.json in the current directory.""",
+    default="langgraph.json",
     type=click.Path(
         exists=True,
         file_okay=True,
@@ -88,7 +106,9 @@ OPT_C = click.option(
         path_type=pathlib.Path,
     ),
 )
-OPT_PORT = click.option("--port", "-p", type=int, default=8123)
+OPT_PORT = click.option(
+    "--port", "-p", type=int, default=8123, show_default=True, help="Port to expose"
+)
 
 
 @click.group()
@@ -96,21 +116,26 @@ def cli():
     pass
 
 
+@click.option(
+    "--recreate/--no-recreate",
+    default=False,
+    show_default=True,
+    help="Clear previous data",
+)
+@click.option(
+    "--pull/--no-pull", default=True, show_default=True, help="Pull latest images"
+)
+@OPT_PORT
 @OPT_O
 @OPT_C
-@OPT_PORT
-@click.option("--recreate", is_flag=True, default=False)
-@click.option("--pull", is_flag=True, default=False)
-@cli.command()
+@cli.command(help="Start langgraph API server")
 def up(
-    override: Optional[pathlib.Path],
-    config: Optional[pathlib.Path],
+    config: pathlib.Path,
+    docker_compose: Optional[pathlib.Path],
     port: int,
     recreate: bool,
     pull: bool,
 ):
-    if not override and not config:
-        raise click.UsageError("Must provide either --override or --config")
     with asyncio.Runner() as runner:
         # check docker available
         try:
@@ -126,13 +151,13 @@ def up(
         stdin = langgraph_cli.docker.compose(port=port)
         args = [
             "--project-directory",
-            override.parent if override else config.parent,
+            config.parent,
             "-f",
             "-",  # stdin
         ]
         # apply options
-        if override:
-            args.extend(["-f", str(override)])
+        if docker_compose:
+            args.extend(["-f", str(docker_compose)])
         args.append("up")
         if config:
             with open(config) as f:

langgraph_cli-0.1.2/langgraph_cli/config.py

@@ -0,0 +1,110 @@
+import json
+import os
+import pathlib
+from typing import TypedDict, Union
+
+
+class Config(TypedDict):
+    dependencies: list[str]
+    graphs: dict[str, str]
+    env: Union[dict[str, str], str]
+
+
+def config_to_compose(config_path: pathlib.Path, config: Config):
+    pypi_deps = [dep for dep in config["dependencies"] if not dep.startswith(".")]
+    local_pkgs: dict[pathlib.Path, str] = {}
+    faux_pkgs: dict[pathlib.Path, str] = {}
+    pkg_names = set()
+
+    for local_dep in config["dependencies"]:
+        if local_dep.startswith("."):
+            resolved = config_path.parent / local_dep
+
+            # validate local dependency
+            if not resolved.exists():
+                raise FileNotFoundError(f"Could not find local dependency: {resolved}")
+            elif not resolved.is_dir():
+                raise NotADirectoryError(
+                    f"Local dependency must be a directory: {resolved}"
+                )
+            elif resolved.name in pkg_names:
+                raise ValueError(f"Duplicate local dependency: {resolved}")
+            else:
+                pkg_names.add(resolved.name)
+
+            # if it's installable, add it to local_pkgs
+            # otherwise, add it to faux_pkgs, and create a pyproject.toml
+            files = os.listdir(resolved)
+            if "pyproject.toml" in files:
+                local_pkgs[resolved] = local_dep
+            elif "setup.py" in files:
+                local_pkgs[resolved] = local_dep
+            else:
+                faux_pkgs[resolved] = local_dep
+
+    for graph_id, import_str in config["graphs"].items():
+        module_str, _, attr_str = import_str.partition(":")
+        if not module_str or not attr_str:
+            message = (
+                'Import string "{import_str}" must be in format "<module>:<attribute>".'
+            )
+            raise ValueError(message.format(import_str=import_str))
+        if module_str.startswith("."):
+            resolved = config_path.parent / module_str
+            if not resolved.exists():
+                raise FileNotFoundError(f"Could not find local module: {resolved}")
+            elif not resolved.is_file():
+                raise IsADirectoryError(f"Local module must be a file: {resolved}")
+            else:
+                for local_pkg in local_pkgs:
+                    if resolved.is_relative_to(local_pkg):
+                        resolved = resolved.relative_to(local_pkg)
+                        break
+                else:
+                    for faux_pkg in faux_pkgs:
+                        if resolved.is_relative_to(faux_pkg):
+                            resolved = resolved.relative_to(faux_pkg.parent)
+                            break
+                    else:
+                        raise ValueError(
+                            f"Module '{import_str}' not found in 'dependencies' list"
+                            "Add its containing package to 'dependencies' list."
+                        )
+            # rewrite module_str to be a python import path
+            module_str = f"{'.'.join(resolved.parts[:-1])}"
+            if resolved.stem == "__init__":
+                pass
+            else:
+                module_str = f"{module_str}.{resolved.stem}"
+            # update the config
+            config["graphs"][graph_id] = f"{module_str}:{attr_str}"
+
+    faux_pkgs_str = "\n\n".join(
+        f"ADD {relpath} /tmp/{fullpath.name}/{fullpath.name}\n                RUN touch /tmp/{fullpath.name}/pyproject.toml"
+        for fullpath, relpath in faux_pkgs.items()
+    )
+    local_pkgs_str = f"ADD {' '.join(local_pkgs.values())} /tmp/" if local_pkgs else ""
+    env_vars_str = (
+        "\n".join(f"            {k}: {v}" for k, v in config["env"].items())
+        if isinstance(config["env"], dict)
+        else ""
+    )
+    env_file_str = (
+        f"env_file: {config['env']}" if isinstance(config["env"], str) else ""
+    )
+
+    return f"""
+            LANGSERVE_GRAPHS: '{json.dumps(config["graphs"])}'
+            {env_vars_str}
+        {env_file_str}
+        pull_policy: build
+        build:
+            dockerfile_inline: |
+                FROM langchain/langserve
+
+                {local_pkgs_str}
+
+                {faux_pkgs_str}
+
+                RUN pip install {' '.join(pypi_deps)} /tmp/*
+"""

{langgraph_cli-0.1.0 → langgraph_cli-0.1.2}/langgraph_cli/docker.py

@@ -2,7 +2,7 @@ import pathlib
 from typing import Optional
 
 
-ROOT = pathlib.Path(__file__).parent.parent.resolve()
+ROOT = pathlib.Path(__file__).parent.resolve()
 
 
 DB = f"""

langgraph_cli-0.1.2/langgraph_cli/initdb/init.sql

@@ -0,0 +1 @@
+create schema if not exists langserve;

{langgraph_cli-0.1.0 → langgraph_cli-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langgraph-cli"
-version = "0.1.0"
+version = "0.1.2"
 description = ""
 authors = ["Nuno Campos <nuno@langchain.dev>"]
 readme = "README.md"

langgraph_cli-0.1.0/langgraph_cli/config.py

@@ -1,81 +0,0 @@
-import json
-import os
-import pathlib
-from typing import TypedDict, Union
-
-
-class Config(TypedDict):
-    dependencies: list[str]
-    graphs: dict[str, str]
-    env: Union[dict[str, str], str]
-
-
-def config_to_compose(config_path: pathlib.Path, config: Config):
-    pypi_deps = [dep for dep in config["dependencies"] if not dep.startswith(".")]
-    local_pkgs = []
-    faux_pkgs = {}
-    locals_set = set()
-
-    for local_dep in config["dependencies"]:
-        if local_dep.startswith("."):
-            resolved = config_path.parent / local_dep
-
-            # validate local dependency
-            if not resolved.exists():
-                raise FileNotFoundError(f"Could not find local dependency: {resolved}")
-            elif not resolved.is_dir():
-                raise NotADirectoryError(
-                    f"Local dependency must be a directory: {resolved}"
-                )
-            elif resolved.name in locals_set:
-                raise ValueError(f"Duplicate local dependency: {resolved}")
-            else:
-                locals_set.add(resolved.name)
-
-            # if it's installable, add it to local_pkgs
-            # otherwise, add it to faux_pkgs, and create a pyproject.toml
-            files = os.listdir(resolved)
-            if "pyproject.toml" in files:
-                local_pkgs.append(local_dep)
-            elif "setup.py" in files:
-                local_pkgs.append(local_dep)
-            else:
-                faux_pkgs[resolved.name] = local_dep
-
-    for _, import_str in config["graphs"].items():
-        module_str, _, attrs_str = import_str.partition(":")
-        if not module_str or not attrs_str:
-            message = (
-                'Import string "{import_str}" must be in format "<module>:<attribute>".'
-            )
-            raise ValueError(message.format(import_str=import_str))
-
-    faux_pkgs_str = "\n\n".join(
-        f"ADD {path} /tmp/{name}/{name}\n                RUN touch /tmp/{name}/pyproject.toml"
-        for name, path in faux_pkgs.items()
-    )
-    local_pkgs_str = f"ADD {' '.join(local_pkgs)} /tmp/" if local_pkgs else ""
-    env_vars_str = (
-        "\n".join(f"            {k}: {v}" for k, v in config["env"].items())
-        if isinstance(config["env"], dict)
-        else ""
-    )
-    env_file_str = (
-        f"env_file: {config['env']}" if isinstance(config["env"], str) else ""
-    )
-
-    return f"""
-            LANGSERVE_GRAPHS: '{json.dumps(config["graphs"])}'
-            {env_vars_str}
-        {env_file_str}
-        pull_policy: build
-        build:
-            dockerfile_inline: |
-                FROM langchain/langserve
-
-                {local_pkgs_str}
-
-                {faux_pkgs_str}
-
-                RUN pip install {' '.join(pypi_deps)} /tmp/*
-"""