Fixed issue where options was incorrectly added into multipart fields

wkok · Nov 4, 2023 · 4ac64cf · 4ac64cf
1 parent 4b3bf17
commit 4ac64cf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/wkok/openai_clojure/openai.clj b/src/wkok/openai_clojure/openai.clj
@@ -51,12 +51,13 @@
 (def multipart-form-data
   {:name ::multipart-form-data
    :enter (fn [{:keys [handler params] :as ctx}]
-            (if (multipart-form-data? handler)
-              (-> (assoc-in ctx [:request :multipart]
-                            (map param->multipart-entry params))
-                  (update-in [:request :headers] dissoc "Content-Type")
-                  (update :request dissoc :body))
-              ctx))})
+            (let [params' (dissoc params :wkok.openai-clojure.core/options)]
+              (if (multipart-form-data? handler)
+                (-> (assoc-in ctx [:request :multipart]
+                              (map param->multipart-entry params'))
+                    (update-in [:request :headers] dissoc "Content-Type")
+                    (update :request dissoc :body))
+                ctx)))})
 
 (defn update-file-schema
   [m operation-id field-name]

diff --git a/test/wkok/openai_clojure/openai_test.clj b/test/wkok/openai_clojure/openai_test.clj
@@ -18,7 +18,8 @@
                                         :mask (io/file "path/to/mask.png")
                                         :prompt "A cute baby sea otter wearing a beret"
                                         :n 2
-                                        :size "1024x1024"})]
+                                        :size "1024x1024"
+                                        :wkok.openai-clojure.core/options {:api-key "123"}})]
 
       (testing "contains Authorization header"
         (is (contains? (:headers request) "Authorization")))
@@ -30,7 +31,10 @@
       (testing "multipart prompt set correctly"
         (let [prompt (find-multipart request "prompt")]
           (is (= "A cute baby sea otter wearing a beret"
-                 (:content prompt))))))))
+                 (:content prompt)))))
+
+      (testing "options not set in multipart fields"
+        (is (nil? (find-multipart request "options")))))))
 
 (deftest add-headers-init
   (let [add-headers-fn (-> openai/add-headers :enter)]