Remove the model field from the countTokens request payload (#162)

The `model` isn't a required part of the `countTokens` request, as it's already part of the request URL.

.changeset/fifty-masks-leave.md

@@ -0,0 +1,5 @@
+---
+"@google/generative-ai": patch
+---
+
+Removed the `model` field from the internally formatted payload of `countToken` requests as it was unnecessary.

packages/main/src/methods/count-tokens.ts

@@ -33,7 +33,7 @@ export async function countTokens(
     Task.COUNT_TOKENS,
     apiKey,
     false,
-    JSON.stringify({ ...params, model }),
+    JSON.stringify(params),
     requestOptions,
   );
   return response.json();

packages/main/test-integration/node/count-tokens.test.ts

@@ -66,4 +66,28 @@ describe("countTokens", function () {
     const response = await model.countTokens(countTokensRequest);
     expect(response.totalTokens).to.equal(3);
   });
+  it("counts tokens with GenerateContentRequest", async () => {
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const model = genAI.getGenerativeModel({
+      model: "gemini-1.5-flash-latest",
+      safetySettings: [
+        {
+          category: HarmCategory.HARM_CATEGORY_HARASSMENT,
+          threshold: HarmBlockThreshold.BLOCK_ONLY_HIGH,
+        },
+      ],
+    });
+    const countTokensRequest: CountTokensRequest = {
+      generateContentRequest: {
+        contents: [
+          {
+            role: "user",
+            parts: [{ text: "count me again with a different result" }],
+          },
+        ],
+      },
+    };
+    const response = await model.countTokens(countTokensRequest);
+    expect(response.totalTokens).to.equal(8);
+  });
 });