Merge branch 'master' into griffin/image-path-serializer

wandb · Nov 5, 2024 · 3067967 · 3067967
2 parents 23b575b + a220c08
commit 3067967
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/tests/integrations/litellm/client_completions_create_test.py b/tests/integrations/litellm/client_completions_create_test.py
@@ -57,8 +57,18 @@ def test_completions_create(client):
             "completion_tokens": 9,
             "prompt_tokens": 11,
             "total_tokens": 20,
-            "completion_tokens_details": {"audio_tokens": None, "reasoning_tokens": 0},
-            "prompt_tokens_details": {"audio_tokens": None, "cached_tokens": 0},
+            "completion_tokens_details": {
+                "accepted_prediction_tokens": None,
+                "audio_tokens": None,
+                "reasoning_tokens": 0,
+                "rejected_prediction_tokens": None,
+            },
+            "prompt_tokens_details": {
+                "accepted_prediction_tokens": None,
+                "audio_tokens": None,
+                "cached_tokens": 0,
+                "rejected_prediction_tokens": None,
+            },
         },
         "service_tier": None,
     }

diff --git a/tests/integrations/litellm/litellm_test.py b/tests/integrations/litellm/litellm_test.py
@@ -225,7 +225,6 @@ async def test_litellm_quickstart_stream_async(
     filter_headers=["authorization", "x-api-key"],
     allowed_hosts=["api.wandb.ai", "localhost"],
 )
-@pytest.mark.asyncio
 def test_model_predict(
     client: weave.trace.weave_client.WeaveClient, patch_litellm: None
 ) -> None:

diff --git a/weave-js/package.json b/weave-js/package.json
@@ -93,13 +93,13 @@
     "plotly.js-dist-min": "^2.6.3",
     "prismjs": "1.29.0",
     "query-string": "^8.1.0",
-    "react": "^17.0.2",
+    "react": "^18.3.1",
     "react-app-polyfill": "^3.0.0",
     "react-base-table": "^1.12.0",
     "react-cytoscapejs": "^1.2.1",
     "react-datetime": "^3",
     "react-diff-viewer": "^3.1.1",
-    "react-dom": "^17.0.2",
+    "react-dom": "^18.3.1",
     "react-hook-mousetrap": "^2.0.4",
     "react-intersection-observer": "^8.31.0",
     "react-markdown": "^8.0.7",
@@ -245,7 +245,6 @@
     "@types/react": "^17.0.26",
     "@types/react-dom": "^17.0.9",
     "handlebars": "^4.7.7",
-    "lodash": "^4.17.21",
-    "react": "^17.0.2"
+    "lodash": "^4.17.21"
   }
 }
diff --git a/weave-js/yarn.lock b/weave-js/yarn.lock
@@ -12449,14 +12449,13 @@ react-diff-viewer@^3.1.1:
     memoize-one "^5.0.4"
     prop-types "^15.6.2"
 
-react-dom@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
-  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
+react-dom@^18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
+  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    scheduler "^0.20.2"
+    scheduler "^0.23.2"
 
 react-draggable@^4.0.3:
   version "4.4.5"
@@ -12741,13 +12740,12 @@ react-window@^1.8.2:
     "@babel/runtime" "^7.0.0"
     memoize-one ">=3.1.1 <6"
 
-react@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
-  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
+react@^18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
+  integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
 
 read-cache@^1.0.0:
   version "1.0.0"
@@ -13423,13 +13421,12 @@ saxes@^6.0.0:
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
-  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
+scheduler@^0.23.2:
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
+  integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
 
 script-onload@^1.0.2:
   version "1.0.2"