Cache retry config (#1622)

Since
```
    urllib3_version = importlib.metadata.version("urllib3")

```

Calls os.stat under the hood

---------

Signed-off-by: William Fu-Hinthorn <[email protected]>

Author: hinthornw

python/Makefile

@@ -22,6 +22,7 @@ profile-background-thread:
 view-profile:
 	poetry run snakeviz profiles/${PROFILE_NAME}.prof
 
+TEST ?= "tests/unit_tests"
 tests:
 	env \
 	 -u LANGCHAIN_PROJECT \
@@ -30,16 +31,17 @@ tests:
 	 -u LANGSMITH_TRACING \
 	 PYTHONDEVMODE=1 \
 	 PYTHONASYNCIODEBUG=1 \
-	 poetry run python -m pytest --disable-socket --allow-unix-socket -n auto --durations=10 tests/unit_tests
+	 poetry run python -m pytest --disable-socket --allow-unix-socket -n auto --durations=10 ${TEST}
 
 tests_watch:
 	poetry run ptw --now . -- -vv -x  tests/unit_tests
 
+INT_TEST ?= "tests/integration_tests"
 integration_tests:
-	poetry run python -m pytest -x -v --durations=10 --cov=langsmith --cov-report=term-missing --cov-report=html --cov-config=.coveragerc tests/integration_tests
+	poetry run python -m pytest -x -v --durations=10 --cov=langsmith --cov-report=term-missing --cov-report=html --cov-config=.coveragerc ${INT_TEST}
 
 integration_tests_fast:
-	poetry run python -m pytest -x -n auto --durations=10 -v --cov=langsmith --cov-report=term-missing --cov-report=html --cov-config=.coveragerc tests/integration_tests
+	poetry run python -m pytest -x -n auto --durations=10 -v --cov=langsmith --cov-report=term-missing --cov-report=html --cov-config=.coveragerc ${INT_TEST}
 
 doctest:
 	poetry run python -m pytest -n auto -x --durations=10 --doctest-modules langsmith

python/langsmith/client.py

@@ -217,6 +217,7 @@ def _is_langchain_hosted(url: str) -> bool:
 ]
 
 
+@functools.lru_cache(maxsize=1)
 def _default_retry_config() -> Retry:
     """Get the default retry configuration.
 
@@ -7672,6 +7673,8 @@ def _convert_stored_attachments_to_attachments_dict(
     attachments_dict = {}
     if attachments_key in data and data[attachments_key]:
         for key, value in data[attachments_key].items():
+            if not key.startswith("attachment."):
+                continue
             response = requests.get(value["presigned_url"], stream=True)
             response.raise_for_status()
             reader = io.BytesIO(response.content)

python/langsmith/run_helpers.py

@@ -1583,8 +1583,12 @@ def _get_inputs_and_attachments_safe(
         return {"args": args, "kwargs": kwargs}, {}
 
 
-def _set_tracing_context(context: Dict[str, Any]):
+def _set_tracing_context(context: Optional[Dict[str, Any]] = None):
     """Set the tracing context."""
+    if context is None:
+        for k, v in _CONTEXT_KEYS.items():
+            v.set(None)
+        return
     for k, v in context.items():
         var = _CONTEXT_KEYS[k]
         var.set(v)

python/poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langsmith"
-version = "0.3.20"
+version = "0.3.21"
 description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform."
 authors = ["LangChain <[email protected]>"]
 license = "MIT"
@@ -76,6 +76,7 @@ multipart = "^1.0.0"
 # TODO: remove
 httpx = ">=0.23.0,<0.28.0"
 rich = "^13.9.4"
+pytest-retry = "^1.7.0"
 
 [tool.poetry.group.lint.dependencies]
 openai = "^1.55"

python/pyproject.toml

@@ -925,6 +925,7 @@ def test_multipart_ingest_create_with_attachments_error(
         langchain_client.multipart_ingest(create=runs_to_create, update=[])
 
 
+@pytest.mark.flaky(retries=3)
 def test_multipart_ingest_create_with_attachments(
     langchain_client: Client, caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -958,10 +959,13 @@ def test_multipart_ingest_create_with_attachments(
         langchain_client.multipart_ingest(
             create=runs_to_create, update=[], dangerously_allow_filesystem=True
         )
+        langchain_client.flush()
         assert not caplog.records
         wait_for(lambda: _get_run(str(trace_a_id), langchain_client))
         created_run = langchain_client.read_run(run_id=str(trace_a_id))
-        assert sorted(created_run.attachments.keys()) == sorted(["foo", "bar"])
+        assert sorted(created_run.attachments.keys()) == sorted(
+            ["foo", "bar"]
+        ), f"See failed run at {created_run.url}"
         assert created_run.attachments["foo"]["reader"].read() == b"bar"
         assert (
             created_run.attachments["bar"]["reader"].read()

python/tests/integration_tests/test_client.py

@@ -679,6 +679,7 @@ def filter_outputs(outputs: dict):
     assert all([exp in all_posted for exp in expected])
 
 
+@pytest.mark.flaky(retries=3)
 def test_client_gc_after_autoscale() -> None:
     session = mock.MagicMock(spec=requests.Session)
     client = Client(

python/tests/unit_tests/test_client.py

@@ -1731,6 +1731,7 @@ def consume(gen):
     assert list(consume(wrapped)) == list(range(5))
 
 
+@pytest.mark.flaky(retries=3)
 def test_traceable_input_attachments():
     with patch.object(ls_client.ls_env, "get_runtime_environment") as mock_get_env:
         mock_get_env.return_value = {
@@ -1751,14 +1752,17 @@ def my_func(
 
         mock_client = _get_mock_client(
             info=ls_schemas.LangSmithInfo(
+                instance_flags={
+                    "zstd_compression_enabled": False,
+                },
                 batch_ingest_config=ls_schemas.BatchIngestConfig(
                     use_multipart_endpoint=True,
                     size_limit_bytes=None,  # Note this field is not used here
                     size_limit=100,
                     scale_up_nthreads_limit=16,
                     scale_up_qsize_trigger=1000,
                     scale_down_nempty_trigger=4,
-                )
+                ),
             ),
         )
         long_content = b"c" * 20_000_000
@@ -1771,6 +1775,8 @@ def my_func(
             )
             assert result == "foo"
 
+        mock_client.flush()
+
         for _ in range(20):
             calls = _get_calls(mock_client)
             datas = _get_multipart_data(calls)