chore: added new fixture for gpt-4.5 so it will return tool_calls

Author: dragos199993

.pre-commit-config.yaml

@@ -24,4 +24,4 @@ repos:
     hooks:
       - id: flake8
         args: [--max-line-length=130]
-        exclude: ^(cookbooks|docs)
+        exclude: ^(cookbooks|docs|tests/conftest.py)

notdiamond/settings.py

@@ -63,9 +63,8 @@
             "gpt-4-turbo-preview",
             "gpt-4-0125-preview",
             "gpt-4-1106-preview",
-            # Need to update langchain-openai to >=0.3.9 to support these
-            # "gpt-4.5-preview",
-            # "gpt-4.5-preview-2025-02-27"
+            "gpt-4.5-preview",
+            "gpt-4.5-preview-2025-02-27",
         ],
         "support_response_model": [
             "gpt-3.5-turbo",

poetry.lock

@@ -18,7 +18,7 @@ cryptography = ">=44.0.1"
 tiktoken = ">=0.8.0,<0.9.0"
 langchain = { version = ">=0.3.22", optional = true }
 langchain-google-genai = { version = ">=2.1.2", optional = true }
-langchain-openai = { version = ">=0.3.5", optional = true }
+langchain-openai = { version = ">=0.3.9", optional = true }
 langchain-anthropic = { version = ">=0.3.10", optional = true }
 langchain-community = { version = ">=0.3.20", optional = true }
 langchain-mistralai = { version = ">=0.2.10", optional = true }
@@ -33,13 +33,12 @@ unstructured = { extras = [
 onnxruntime = { version = "<1.20", optional = true }
 python-multipart = { version = "0.0.18", extras = ["rag"] }
 llama-index = { version = "^0.12.25", optional = true }
-r2r = ">=3.5.9"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^8.0.0"
 pytest-asyncio = "^0.23.6"
 pytest-mock = "^3.14.0"
-openai = ">=1.60.0"
+openai = ">=1.66.3"
 coverage = "^7.6.0"
 pytest-recording = "^0.13.2"
 pytest-timeout = "^2.3.1"

pyproject.toml

@@ -95,6 +95,23 @@ def openai_tools_fixture():
     return [add_tool]
 
 
+@pytest.fixture
+def get_stock_price_tool_fixture():
+    """Fixture that creates a tool for getting stock prices."""
+    stock_tool = {
+        "name": "get_stock_price",
+        "description": "Get current stock price for a provided ticker symbol from Yahoo Finance using the yahooquery Python library.",
+        "parameters": {
+            "type": "object",
+            "properties": {"ticker": {"type": "string"}},
+            "required": ["ticker"],
+            "additionalProperties": False,
+        },
+    }
+
+    return [stock_tool]
+
+
 @pytest.fixture
 def response_model():
     class Joke(BaseModel):

tests/conftest.py

@@ -0,0 +1,216 @@
+interactions:
+- request:
+    body: '{"messages": [{"role": "user", "content": "How much is 3 + 5?"}], "llm_providers":
+      [{"provider": "openai", "model": "gpt-4.5-preview", "is_custom": false, "context_length":
+      null, "input_price": null, "output_price": null, "latency": null}], "metric":
+      "accuracy", "max_model_depth": 1, "hash_content": false, "tools": [{"type":
+      "function", "function": {"name": "add_fct", "description": "Add two numbers",
+      "parameters": {"type": "object", "properties": {"a": {"type": "integer", "description":
+      "The first number"}, "b": {"type": "integer", "description": "The second number"}},
+      "required": ["a", "b"]}}}]}'
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, zstd
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '604'
+      User-Agent:
+      - Python-SDK/0.4.2
+      content-type:
+      - application/json
+    method: POST
+    uri: https://staging-api.notdiamond.ai/v2/modelRouter/modelSelect
+  response:
+    body:
+      string: '{"providers":[{"provider":"openai","model":"gpt-4.5-preview"}],"session_id":"5fb8445b-ff9e-4b57-9acd-2d9d0c6f6b3e"}'
+    headers:
+      CF-RAY:
+      - 92a11e0a989d0d4f-SOF
+      Connection:
+      - keep-alive
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 02 Apr 2025 14:46:44 GMT
+      Server:
+      - cloudflare
+      Transfer-Encoding:
+      - chunked
+      alt-svc:
+      - h3=":443"; ma=86400
+      cf-cache-status:
+      - DYNAMIC
+      content-length:
+      - '115'
+      rndr-id:
+      - 4dd7a88f-b631-4f4b
+      vary:
+      - Accept-Encoding
+      x-render-origin-server:
+      - uvicorn
+    status:
+      code: 200
+      message: OK
+- request:
+    body: '{"messages": [{"content": "How much is 3 + 5?", "role": "user"}], "model":
+      "gpt-4.5-preview", "max_completion_tokens": 200, "stream": false, "tools": [{"type":
+      "function", "function": {"name": "add_fct", "description": "Add two numbers",
+      "parameters": {"type": "object", "properties": {"a": {"type": "integer", "description":
+      "The first number"}, "b": {"type": "integer", "description": "The second number"}},
+      "required": ["a", "b"]}}}]}'
+    headers:
+      accept:
+      - application/json
+      accept-encoding:
+      - gzip, deflate, zstd
+      connection:
+      - keep-alive
+      content-length:
+      - '437'
+      content-type:
+      - application/json
+      host:
+      - api.openai.com
+      user-agent:
+      - OpenAI/Python 1.70.0
+      x-stainless-arch:
+      - x64
+      x-stainless-async:
+      - 'false'
+      x-stainless-lang:
+      - python
+      x-stainless-os:
+      - Linux
+      x-stainless-package-version:
+      - 1.70.0
+      x-stainless-read-timeout:
+      - '120.0'
+      x-stainless-retry-count:
+      - '0'
+      x-stainless-runtime:
+      - CPython
+      x-stainless-runtime-version:
+      - 3.12.3
+    method: POST
+    uri: https://api.openai.com/v1/chat/completions
+  response:
+    body:
+      string: "{\n  \"id\": \"chatcmpl-BHteWM3dNbq2UiM7cbMF7yccELYnx\",\n  \"object\":
+        \"chat.completion\",\n  \"created\": 1743605204,\n  \"model\": \"gpt-4.5-preview-2025-02-27\",\n
+        \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
+        \"assistant\",\n        \"content\": \"\\\\(3 + 5 = 8\\\\)\",\n        \"refusal\":
+        null,\n        \"annotations\": []\n      },\n      \"finish_reason\": \"stop\"\n
+        \   }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 64,\n    \"completion_tokens\":
+        12,\n    \"total_tokens\": 76,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\":
+        0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\":
+        {\n      \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\":
+        0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"service_tier\":
+        \"default\",\n  \"system_fingerprint\": null\n}\n"
+    headers:
+      CF-RAY:
+      - 92a11e0f8af4b5c8-SOF
+      Connection:
+      - keep-alive
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 02 Apr 2025 14:46:47 GMT
+      Server:
+      - cloudflare
+      Set-Cookie:
+      - __cf_bm=e1hGRQbVfWbQAUfTWkiHBV58D0JiA7DvneWayu7cK1Y-1743605207-1.0.1.1-dMrwzvpkaZ6UqRANnwL7kyZnUeKBubze87lVISrsLjGbzTEtpCNIDloWXY6wgW_RWuhTNRY7fBruJQd05I3hrHRFrAGjhP3gPySqcE7a0Rg;
+        path=/; expires=Wed, 02-Apr-25 15:16:47 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=S2kCgoIa_ZQAJnOXZoUBZQM.o1yCue0O1RtcICIMHQM-1743605207502-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      Transfer-Encoding:
+      - chunked
+      X-Content-Type-Options:
+      - nosniff
+      access-control-expose-headers:
+      - X-Request-ID
+      alt-svc:
+      - h3=":443"; ma=86400
+      cf-cache-status:
+      - DYNAMIC
+      content-length:
+      - '791'
+      openai-organization:
+      - not-diamond-bdz8cg
+      openai-processing-ms:
+      - '2915'
+      openai-version:
+      - '2020-10-01'
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains; preload
+      x-ratelimit-limit-requests:
+      - '10000'
+      x-ratelimit-limit-tokens:
+      - '2000000'
+      x-ratelimit-remaining-requests:
+      - '9999'
+      x-ratelimit-remaining-tokens:
+      - '1999993'
+      x-ratelimit-reset-requests:
+      - 6ms
+      x-ratelimit-reset-tokens:
+      - 0s
+      x-request-id:
+      - req_6bbe0297b07f4fef026163d118c45ab7
+    status:
+      code: 200
+      message: OK
+- request:
+    body: '{"session_id": "5fb8445b-ff9e-4b57-9acd-2d9d0c6f6b3e", "provider": {"provider":
+      "openai", "model": "gpt-4.5-preview", "is_custom": false, "context_length":
+      null, "input_price": null, "output_price": null, "latency": null}, "feedback":
+      {"tokens_per_second": 0.9338486470343585}}'
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, zstd
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '277'
+      User-Agent:
+      - Python-SDK/0.4.2
+      content-type:
+      - application/json
+    method: POST
+    uri: https://staging-api.notdiamond.ai/v2/report/metrics/latency
+  response:
+    body:
+      string: '{"detail":"requestID=d8be5161-40e4-401d, Session 5fb8445b-ff9e-4b57-9acd-2d9d0c6f6b3e
+        does not belong to user d6b6f4db-9cd9-4a33-b885-506685cd2d34."}'
+    headers:
+      CF-RAY:
+      - 92a11e239c7c5b6d-VIE
+      Connection:
+      - keep-alive
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 02 Apr 2025 14:46:47 GMT
+      Server:
+      - cloudflare
+      Transfer-Encoding:
+      - chunked
+      alt-svc:
+      - h3=":443"; ma=86400
+      cf-cache-status:
+      - DYNAMIC
+      rndr-id:
+      - d8be5161-40e4-401d
+      vary:
+      - Accept-Encoding
+      x-render-origin-server:
+      - uvicorn
+    status:
+      code: 401
+      message: Unauthorized
+version: 1