Added "specific" case to Model, allowing for the use of new features …

…(such as function calling) that are not yet available on the mainline versions of the GPT models.
btfranklin · Jun 18, 2023 · b7bcf3b · b7bcf3b
1 parent 18aef5c
commit b7bcf3b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/Sources/CleverBird/chat/ChatThread+tokenCount.swift b/Sources/CleverBird/chat/ChatThread+tokenCount.swift
@@ -19,6 +19,8 @@ extension ChatThread {
             tokensPerMessage = 4
         case .gpt4:
             tokensPerMessage = 3
+        case .specific(_):
+            tokensPerMessage = 3
         }
 
         var numTokens = 0

diff --git a/Sources/CleverBird/datatypes/Model.swift b/Sources/CleverBird/datatypes/Model.swift
@@ -1,6 +1,7 @@
-public enum Model: String, Codable {
-    case gpt35Turbo = "gpt-3.5-turbo"
-    case gpt4 = "gpt-4"
+public enum Model: Codable {
+    case gpt35Turbo
+    case gpt4
+    case specific(String)
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.singleValueContainer()
@@ -12,7 +13,24 @@ public enum Model: String, Codable {
         case _ where modelString.starts(with: "gpt-4"):
             self = .gpt4
         default:
-            throw DecodingError.dataCorruptedError(in: container, debugDescription: "Cannot initialize Model from invalid String value: \(modelString)")
+            self = .specific(modelString)
         }
     }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+        let modelString: String
+
+        switch self {
+        case .gpt35Turbo:
+            modelString = "gpt-3.5-turbo"
+        case .gpt4:
+            modelString = "gpt-4"
+        case .specific(let specificString):
+            modelString = specificString
+        }
+
+        try container.encode(modelString)
+    }
+
 }