Merge pull request #2 from use-the-fork/development

Development
use-the-fork · Oct 16, 2024 · 9c28442 · 9c28442
2 parents 2881237 + 96c422b
commit 9c28442
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 3 deletions.
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: main
           token: ${{ secrets.COMMIT_TOKEN }}

diff --git a/tests/Agents/SQLToolAgentTest.php b/tests/Agents/SQLToolAgentTest.php
@@ -48,7 +48,7 @@
 
     MockClient::global([
         ChatRequest::class => function (PendingRequest $pendingRequest): \Saloon\Http\Faking\Fixture {
-            $count = md5(json_encode($pendingRequest->body()->all()));
+            $count = md5(json_encode($pendingRequest->body()->get('messages')));
 
             return MockResponse::fixture("Agents/SQLToolAgent-{$count}");
         },
@@ -60,5 +60,5 @@
     $agentResponseArray = $message->toArray();
     expect($agentResponseArray['content'])->toBeArray()
       ->and($agentResponseArray['content'])->toHaveKey('answer')
-      ->and($agentResponseArray['content']['answer'])->toContain('There are 100 organizations currently operating, and the average number of funding rounds for them is 5.');
+      ->and($agentResponseArray['content']['answer'])->toContain('There are 100 operating organizations and the average number of funding rounds for them is 5.');
 });
diff --git a/tests/Fixtures/Saloon/Agents/SQLToolAgent-0b0867cd35d40e15c4e6ee69e34045b9.json b/tests/Fixtures/Saloon/Agents/SQLToolAgent-0b0867cd35d40e15c4e6ee69e34045b9.json
@@ -0,0 +1,10 @@
+{
+  "statusCode": 200,
+  "headers": {
+    "Date": "Wed, 16 Oct 2024 23:53:58 GMT",
+    "Content-Type": "application/json",
+    "Content-Length": "925",
+    "Connection": "keep-alive"
+  },
+  "data": "{\n  \"id\": \"chatcmpl-AJ87xAJ2JNm18lP8fPhsoJsYHrEc2\",\n  \"object\": \"chat.completion\",\n  \"created\": 1729122837,\n  \"model\": \"gpt-4-turbo-2024-04-09\",\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\": \"assistant\",\n        \"content\": null,\n        \"tool_calls\": [\n          {\n            \"id\": \"call_YRRYKdXqKRF2k1PUQXPqNujy\",\n            \"type\": \"function\",\n            \"function\": {\n              \"name\": \"info_s_q_l_database_tool\",\n              \"arguments\": \"{\\\"tables\\\":\\\"organizations\\\"}\"\n            }\n          }\n        ],\n        \"refusal\": null\n      },\n      \"logprobs\": null,\n      \"finish_reason\": \"tool_calls\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 449,\n    \"completion_tokens\": 18,\n    \"total_tokens\": 467,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n      \"reasoning_tokens\": 0\n    }\n  },\n  \"system_fingerprint\": \"fp_83975a045a\"\n}\n"
+}
diff --git a/tests/Fixtures/Saloon/Agents/SQLToolAgent-58b2f699ebef4cb1ebebf4221b228d5e.json b/tests/Fixtures/Saloon/Agents/SQLToolAgent-58b2f699ebef4cb1ebebf4221b228d5e.json
@@ -0,0 +1,14 @@
+{
+    "statusCode": 200,
+    "headers": {
+        "Date": "Wed, 16 Oct 2024 23:53:57 GMT",
+        "Content-Type": "application\/json",
+        "Content-Length": "897",
+        "Connection": "keep-alive",
+        "access-control-expose-headers": "X-Request-ID",
+        "openai-organization": "user-5hvzt3x5aqwr0picqhxifwl8",
+        "openai-processing-ms": "819",
+        "openai-version": "2020-10-01"
+    },
+    "data": "{\n  \"id\": \"chatcmpl-AJ87wCMef7zUWGnJeUmY6NmE570vD\",\n  \"object\": \"chat.completion\",\n  \"created\": 1729122836,\n  \"model\": \"gpt-4-turbo-2024-04-09\",\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\": \"assistant\",\n        \"content\": null,\n        \"tool_calls\": [\n          {\n            \"id\": \"call_yyXdaOAyYq3qDCmDwDEcC9cB\",\n            \"type\": \"function\",\n            \"function\": {\n              \"name\": \"list_s_q_l_database_tool\",\n              \"arguments\": \"{}\"\n            }\n          }\n        ],\n        \"refusal\": null\n      },\n      \"logprobs\": null,\n      \"finish_reason\": \"tool_calls\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 388,\n    \"completion_tokens\": 14,\n    \"total_tokens\": 402,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n      \"reasoning_tokens\": 0\n    }\n  },\n  \"system_fingerprint\": \"fp_83975a045a\"\n}\n"
+}
diff --git a/tests/Fixtures/Saloon/Agents/SQLToolAgent-ca35aaabff5f4b53409aa9635246f84a.json b/tests/Fixtures/Saloon/Agents/SQLToolAgent-ca35aaabff5f4b53409aa9635246f84a.json
@@ -0,0 +1,10 @@
+{
+    "statusCode": 200,
+    "headers": {
+        "Date": "Wed, 16 Oct 2024 23:54:01 GMT",
+        "Content-Type": "application\/json",
+        "Content-Length": "1054",
+        "Connection": "keep-alive"
+    },
+    "data": "{\n  \"id\": \"chatcmpl-AJ87zexuBFOyNj25s7F3amktioBRM\",\n  \"object\": \"chat.completion\",\n  \"created\": 1729122839,\n  \"model\": \"gpt-4-turbo-2024-04-09\",\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\": \"assistant\",\n        \"content\": null,\n        \"tool_calls\": [\n          {\n            \"id\": \"call_fa4zFfmXKbS7y0rEE0N44CSe\",\n            \"type\": \"function\",\n            \"function\": {\n              \"name\": \"query_s_q_l_data_base_tool\",\n              \"arguments\": \"{\\\"query\\\":\\\"SELECT COUNT(*) AS operating_organizations, AVG(num_funding_rounds) AS average_funding_rounds FROM organizations WHERE status = 'operating'\\\"}\"\n            }\n          }\n        ],\n        \"refusal\": null\n      },\n      \"logprobs\": null,\n      \"finish_reason\": \"tool_calls\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 1170,\n    \"completion_tokens\": 48,\n    \"total_tokens\": 1218,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n      \"reasoning_tokens\": 0\n    }\n  },\n  \"system_fingerprint\": \"fp_83975a045a\"\n}\n"
+}
diff --git a/tests/Fixtures/Saloon/Agents/SQLToolAgent-f31398b834b15382e7ad551a39889dd7.json b/tests/Fixtures/Saloon/Agents/SQLToolAgent-f31398b834b15382e7ad551a39889dd7.json
@@ -0,0 +1,9 @@
+{
+  "statusCode": 200,
+  "headers": {
+    "Date": "Wed, 16 Oct 2024 23:54:03 GMT",
+    "Content-Type": "application/json",
+    "Content-Length": "760"
+  },
+  "data": "{\n  \"id\": \"chatcmpl-AJ8823rTNyertHrdfwPsPmeB0793E\",\n  \"object\": \"chat.completion\",\n  \"created\": 1729122842,\n  \"model\": \"gpt-4-turbo-2024-04-09\",\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\": \"assistant\",\n        \"content\": \"```json\\n{\\n    \\\"answer\\\": \\\"There are 100 operating organizations and the average number of funding rounds for them is 5.\\\"\\n}\\n```\",\n        \"refusal\": null\n      },\n      \"logprobs\": null,\n      \"finish_reason\": \"stop\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 1248,\n    \"completion_tokens\": 31,\n    \"total_tokens\": 1279,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n      \"reasoning_tokens\": 0\n    }\n  },\n  \"system_fingerprint\": \"fp_83975a045a\"\n}\n"
+}