tmp

langchain-ai · Oct 28, 2024 · 7c473f6 · 7c473f6
1 parent c6ffe24
commit 7c473f6
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 17 deletions.
diff --git a/.github/scripts/run_langgraph_cli_test.py b/.github/scripts/run_langgraph_cli_test.py
@@ -1,4 +1,6 @@
+import asyncio
 import json
+import os
 import pathlib
 import sys
 import langgraph_cli
@@ -7,6 +9,7 @@
 
 from langgraph_cli.exec import Runner, subp_exec
 from langgraph_cli.progress import Progress
+from langgraph_cli.docker import DEFAULT_POSTGRES_URI
 from langgraph_cli.constants import DEFAULT_PORT
 
 
@@ -70,26 +73,37 @@ def test(
                 ]
             )
 
+        completed_startup = False
+
         def on_stdout(line: str):
-            if "GET /ok" in line:
+            nonlocal completed_startup
+            if "GET /ok" in line or "Uvicorn running on" in line:
                 set("")
                 sys.stdout.write(
                     f"""Ready!
 - API: http://localhost:{port}
 """
                 )
                 sys.stdout.flush()
+                completed_startup = True
+                runner.close()
                 return True
+            return False
 
-        runner.run(
-            subp_exec(
-                "docker",
-                *args,
-                tag,
-                verbose=verbose,
-                on_stdout=on_stdout,
+        try:
+            runner.run(
+                subp_exec(
+                    "docker",
+                    *args,
+                    tag,
+                    verbose=verbose,
+                    on_stdout=on_stdout,
+                )
             )
-        )
+        except asyncio.CancelledError:
+            if not completed_startup:
+                raise ValueError("Failed to complete startup.")
+            pass
 
 
 if __name__ == "__main__":

diff --git a/.github/workflows/_integration_test.yml b/.github/workflows/_integration_test.yml
@@ -44,23 +44,24 @@ jobs:
         working-directory: libs/cli/examples
         run: |
           # The build-arg isn't used; just testing that we accept other args
-          langgraph build -t langgraph-test-a
-          python ../../../.github/scripts/run_langgraph_cli_test.py -c langgraph.json -t langgraph-test-a
+          langgraph build -t langgraph-test-a  --base-image "langchain/langgraph-trial"
+          cp .env.example .envg
+          timeout 60 python ../../../.github/scripts/run_langgraph_cli_test.py -c langgraph.json -t langgraph-test-a
       - name: Build and test service B
         if: steps.changed-files.outputs.all
         working-directory: libs/cli/examples/graphs
         run: |
-          langgraph build -t langgraph-test-b
-          python ../../.github/scripts/run_langgraph_cli_test.py -t langgraph-test-b
+          langgraph build -t langgraph-test-b  --base-image "langchain/langgraph-trial"
+          timeout 60 python ../../../../.github/scripts/run_langgraph_cli_test.py -t langgraph-test-b
       - name: Build and test service C
         if: steps.changed-files.outputs.all
         working-directory: libs/cli/examples/graphs_reqs_a
         run: |
-          langgraph build -t langgraph-test-c
-          python ../../.github/scripts/run_langgraph_cli_test.py -t langgraph-test-c
+          langgraph build -t langgraph-test-c  --base-image "langchain/langgraph-trial"
+          timeout 60 python ../../../../.github/scripts/run_langgraph_cli_test.py -t langgraph-test-c
       - name: Build and test service D
         if: steps.changed-files.outputs.all
         working-directory: libs/cli/examples/graphs_reqs_b
         run: |
-          langgraph build -t langgraph-test-d
-          python ../../.github/scripts/run_langgraph_cli_test.py -t langgraph-test-d
+          langgraph build -t langgraph-test-d  --base-image "langchain/langgraph-trial"
+          timeout 60 python ../../../../.github/scripts/run_langgraph_cli_test.py -t langgraph-test-d