Merge pull request #81 from Not-Diamond/ENG-2023_update-langchain

Update langchain and added tool calling for gpt 4.5

Author: dragos199993

.github/workflows/all-sdk-tests.yml

@@ -28,7 +28,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}

.gitignore

@@ -9,3 +9,4 @@ dist/
 .vscode/
 venv/
 .venv/
+.idea/

.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/llms/client.py

@@ -21,7 +21,7 @@
 )
 
 # Details: https://python.langchain.com/v0.1/docs/guides/development/pydantic_compatibility/
-from pydantic.v1 import BaseModel
+from pydantic import BaseModel
 from pydantic_partial import create_partial_model
 
 from notdiamond import settings

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

@@ -16,30 +16,29 @@ pandas = "^2.2.2"
 pydantic-partial = "^0.5.5"
 cryptography = ">=44.0.1"
 tiktoken = ">=0.8.0,<0.9.0"
-langchain = { version = ">=0.2.7", optional = true }
-langchain-google-genai = { version = ">=1.0.7", optional = true }
-langchain-openai = { version = "^0.1.16", optional = true }
-langchain-anthropic = { version = "^0.1.20", optional = true }
-langchain-community = { version = "^0.2.16", optional = true }
-langchain-mistralai = { version = "^0.1.10", optional = true }
-langchain-together = { version = "^0.1.4", optional = true }
-langchain-cohere = { version = "^0.1.9", optional = true }
+langchain = { version = ">=0.3.22", optional = true }
+langchain-google-genai = { version = ">=2.1.2", 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 }
+langchain-together = { version = ">=0.3.0", optional = true }
+langchain-cohere = { version = ">=0.4.3", optional = true }
 requests = ">=2.31"
 optuna = { version = "^4.1.0", optional = true }
-ragas = { extras = ["all"], version = "^0.2.6", optional = true }
+ragas = { version = "^0.2.6", optional = true }
 unstructured = { extras = [
     "local-inference",
 ], version = "^0.16.5", optional = true }
 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.6"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^8.0.0"
 pytest-asyncio = "^0.23.6"
 pytest-mock = "^3.14.0"
-openai = ">=1.0.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

@@ -6,23 +6,23 @@ interactions:
       null}], "metric": "accuracy", "max_model_depth": 1, "hash_content": false}'
     headers:
       User-Agent:
-      - Python-SDK/0.3.41
+      - 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-3.5-turbo"}],"session_id":"9d8c1977-c521-414d-ad32-9b4c69269fed"}'
+      string: '{"providers":[{"provider":"openai","model":"gpt-3.5-turbo"}],"session_id":"a6c4cc9a-990f-4602-837c-61f9cc65f641"}'
     headers:
       CF-RAY:
-      - 925cfc694d5d5a59-VIE
+      - 92a07723aa105b8d-VIE
       Connection:
       - keep-alive
       Content-Type:
       - application/json
       Date:
-      - Tue, 25 Mar 2025 08:19:55 GMT
+      - Wed, 02 Apr 2025 12:52:47 GMT
       Server:
       - cloudflare
       Transfer-Encoding:
@@ -36,16 +36,14 @@ interactions:
       content-length:
       - '113'
       rndr-id:
-      - 3dd2bf47-6e7c-4d95
+      - cf1e8d4d-d176-4709
       x-render-origin-server:
       - uvicorn
     status:
       code: 200
       message: OK
 - request:
-    body: '{"messages": [{"content": "Prompt: Tell me a joke.", "role": "user"}],
-      "model": "gpt-3.5-turbo", "max_tokens": 10, "n": 1, "stream": false, "temperature":
-      0.7}'
+    body: '{"messages":[{"content":"Prompt: Tell me a joke.","role":"user"}],"model":"gpt-3.5-turbo","stream":false}'
     headers:
       accept:
       - application/json
@@ -54,13 +52,13 @@ interactions:
       connection:
       - keep-alive
       content-length:
-      - '159'
+      - '105'
       content-type:
       - application/json
       host:
       - api.openai.com
       user-agent:
-      - AsyncOpenAI/Python 1.68.2
+      - AsyncOpenAI/Python 1.60.2
       x-stainless-arch:
       - x64
       x-stainless-async:
@@ -70,9 +68,7 @@ interactions:
       x-stainless-os:
       - Linux
       x-stainless-package-version:
-      - 1.68.2
-      x-stainless-read-timeout:
-      - '120.0'
+      - 1.60.2
       x-stainless-retry-count:
       - '0'
       x-stainless-runtime:
@@ -83,34 +79,34 @@ interactions:
     uri: https://api.openai.com/v1/chat/completions
   response:
     body:
-      string: "{\n  \"id\": \"chatcmpl-BEtnnWjXmdkH9MGiaCSrzAPWPKofR\",\n  \"object\":
-        \"chat.completion\",\n  \"created\": 1742890795,\n  \"model\": \"gpt-3.5-turbo-0125\",\n
+      string: "{\n  \"id\": \"chatcmpl-BHrsGFnVhe9JvTv5cTyMAXRDnkhhX\",\n  \"object\":
+        \"chat.completion\",\n  \"created\": 1743598368,\n  \"model\": \"gpt-3.5-turbo-0125\",\n
         \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
-        \"assistant\",\n        \"content\": \"Why couldn't the bicycle stand up by
-        itself?\\n\\n\",\n        \"refusal\": null,\n        \"annotations\": []\n
-        \     },\n      \"logprobs\": null,\n      \"finish_reason\": \"length\"\n
+        \"assistant\",\n        \"content\": \"Why did the scarecrow win an award?\\nBecause
+        he was outstanding in his field!\",\n        \"refusal\": null,\n        \"annotations\":
+        []\n      },\n      \"logprobs\": null,\n      \"finish_reason\": \"stop\"\n
         \   }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 14,\n    \"completion_tokens\":
-        10,\n    \"total_tokens\": 24,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\":
+        18,\n    \"total_tokens\": 32,\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:
-      - 925cfc6dfaf25acf-VIE
+      - 92a0772869bfd0f2-SOF
       Connection:
       - keep-alive
       Content-Type:
       - application/json
       Date:
-      - Tue, 25 Mar 2025 08:19:55 GMT
+      - Wed, 02 Apr 2025 12:52:48 GMT
       Server:
       - cloudflare
       Set-Cookie:
-      - __cf_bm=27OqbJBi6rbSwSFakwNrnXdTx4amaL5Q5NBo5ITiOyM-1742890795-1.0.1.1-vnLFmpWppCuaIVsI32nRgwfpdQVtcZ855roW3Aa9TLU9CANLQhprKag2YZmVk1kF90Z8nJgJCFZonZsmjJwJ4i8o__Ff27WimZnWQ4bhZIg;
-        path=/; expires=Tue, 25-Mar-25 08:49:55 GMT; domain=.api.openai.com; HttpOnly;
+      - __cf_bm=prCQkj6QaXaNCcoJQihkW2Bij8KD3r5V93SDPloGzTY-1743598368-1.0.1.1-dVbJRn1vgFoSmHLYYQAXxmnzhM7ZHtl.wmAUPZc3MwBjS38D9AMOLxiiLBDfySNbyBJICDd9UvZoYX7TUy0eW3l7l3ZFBxGyHkntXsBeQCM;
+        path=/; expires=Wed, 02-Apr-25 13:22:48 GMT; domain=.api.openai.com; HttpOnly;
         Secure; SameSite=None
-      - _cfuvid=Q3pvjMF3pfyC3NCFMhS61FBlhDPgCbniTqiw2nUJYVA-1742890795568-0.0.1.1-604800000;
+      - _cfuvid=RMfE4HeYit80e_VzMK5IFqbHsGAl1BUpiwEEOr.nEqs-1743598368623-0.0.1.1-604800000;
         path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
       Transfer-Encoding:
       - chunked
@@ -123,11 +119,11 @@ interactions:
       cf-cache-status:
       - DYNAMIC
       content-length:
-      - '842'
+      - '869'
       openai-organization:
       - not-diamond-bdz8cg
       openai-processing-ms:
-      - '232'
+      - '402'
       openai-version:
       - '2020-10-01'
       strict-transport-security:
@@ -145,15 +141,15 @@ interactions:
       x-ratelimit-reset-tokens:
       - 0s
       x-request-id:
-      - req_387f06b77cf31e7f9668ef3ad08161d8
+      - req_4c614b950feb80d71f814b52153867bf
     status:
       code: 200
       message: OK
 - request:
-    body: '{"session_id": "9d8c1977-c521-414d-ad32-9b4c69269fed", "provider": {"provider":
+    body: '{"session_id": "a6c4cc9a-990f-4602-837c-61f9cc65f641", "provider": {"provider":
       "openai", "model": "gpt-3.5-turbo", "is_custom": false, "context_length": null,
       "input_price": null, "output_price": null, "latency": null}, "feedback": {"tokens_per_second":
-      34.713605035147786}}'
+      24.643946395404058}}'
     headers:
       Accept:
       - '*/*'
@@ -164,24 +160,24 @@ interactions:
       Content-Length:
       - '275'
       User-Agent:
-      - Python-SDK/0.3.41
+      - 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=80afc164-0f1d-4c56, Session 9d8c1977-c521-414d-ad32-9b4c69269fed
+      string: '{"detail":"requestID=731fc3fe-1403-4396, Session a6c4cc9a-990f-4602-837c-61f9cc65f641
         does not belong to user d6b6f4db-9cd9-4a33-b885-506685cd2d34."}'
     headers:
       CF-RAY:
-      - 925cfc710b24d0ce-SOF
+      - 92a0772caf0fd0da-SOF
       Connection:
       - keep-alive
       Content-Type:
       - application/json
       Date:
-      - Tue, 25 Mar 2025 08:19:56 GMT
+      - Wed, 02 Apr 2025 12:52:49 GMT
       Server:
       - cloudflare
       Transfer-Encoding:
@@ -191,7 +187,7 @@ interactions:
       cf-cache-status:
       - DYNAMIC
       rndr-id:
-      - 80afc164-0f1d-4c56
+      - 731fc3fe-1403-4396
       vary:
       - Accept-Encoding
       x-render-origin-server: