Optimize APIURL settings to support the input of Path.

aiqinxuancai · Jan 22, 2025 · 4aecb45 · 4aecb45
1 parent c55b64c
commit 4aecb45
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/ChatGPTSharp.Sample/ChatGPTSharp.Sample.csproj b/ChatGPTSharp.Sample/ChatGPTSharp.Sample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/ChatGPTSharp.Sample/Program.cs b/ChatGPTSharp.Sample/Program.cs
@@ -8,10 +8,15 @@
 
 ChatGPTClientSettings settings = new ChatGPTClientSettings();
 settings.OpenAIToken = File.ReadAllText("KEY.txt");
-settings.ModelName = "gpt-4o";
-settings.ProxyUri = "http://127.0.0.1:1081";
+settings.ModelName = "anthropic/claude-3.5-sonnet";
+settings.APIURL = "https://openrouter.ai/api";
+
+
+
 
 var client = new ChatGPTClient(settings);
+
+
 client.IsDebug = true;
 
 var ChatImageModels = new List<ChatImageModel>()

diff --git a/ChatGPTSharp/ChatGPTClient.cs b/ChatGPTSharp/ChatGPTClient.cs
@@ -89,7 +89,17 @@ public ChatGPTClient(ChatGPTClientSettings settings)
 
 
             Settings = settings;
-            _tiktoken = TikToken.EncodingForModel(settings.ModelName);
+
+
+            try
+            {
+                _tiktoken = TikToken.EncodingForModel(settings.ModelName);
+            }
+            catch (Exception ex)
+            {
+                _tiktoken = null;
+                settings.DisableCheckTokens = true;
+            }
         }
 
 

diff --git a/ChatGPTSharp/Model/ChatGPTClientSettings.cs b/ChatGPTSharp/Model/ChatGPTClientSettings.cs
@@ -1,6 +1,7 @@
 using ChatGPTSharp.Utils;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Runtime;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -75,7 +76,9 @@ private void UpdateCompletionsUrl()
         {
             UriBuilder uriBuilder = new UriBuilder(APIURL);
 
-            uriBuilder.Path = "/v1/chat/completions";
+
+
+            uriBuilder.Path = uriBuilder.Path + (uriBuilder.Path.EndsWith("/") ? "" : "/") +  "v1/chat/completions";
 
             CompletionsUrl = uriBuilder.Uri.AbsoluteUri;
         }

diff --git a/ChatGPTSharp/Model/ClientModel.cs b/ChatGPTSharp/Model/ClientModel.cs
@@ -42,7 +42,7 @@ public class ChatMessage
         public List<ChatImageModel> ImageContent { get; set; } = new List<ChatImageModel> { };
 
 
-        public (JObject body, int tokens) GetTokens (TikToken tikToken)
+        public (JObject body, int tokens) GetTokens (TikToken? tikToken)
         {
             var body = MessageBody;
             var textTokens = TokenUtils.GetTokensForSingleMessage(tikToken, body);