Merge branch 'main' into gabriella/IsString

agrafix · Mar 23, 2024 · aa66c0f · aa66c0f
2 parents 3b682eb + b534c50
commit aa66c0f
Show file tree

Hide file tree

Showing 10 changed files with 934 additions and 329 deletions.
diff --git a/openai-hs/README.md b/openai-hs/README.md
@@ -21,7 +21,27 @@ import OpenAI.Client
 import Network.HTTP.Client
 import Network.HTTP.Client.TLS
 import System.Environment (getEnv)
-import qualified Data.Vector as V
+import qualified Data.Text as T
+
+request :: ChatCompletionRequest
+request = ChatCompletionRequest 
+         { chcrModel = ModelId "gpt-3.5-turbo"
+         , chcrMessages = 
+            [ChatMessage { chmContent = "Write a hello world program in Haskell"
+                         , chmRole = "user"
+                         }
+            ]
+         , chcrTemperature = Nothing
+         , chcrTopP = Nothing
+         , chcrN = Nothing
+         , chcrStream = Nothing
+         , chcrStop = Nothing
+         , chcrMaxTokens = Nothing
+         , chcrPresencePenalty = Nothing
+         , chcrFrequencyPenalty = Nothing
+         , chcrLogitBias = Nothing
+         , chcrUser = Nothing
+         }
 
 main :: IO ()
 main =
@@ -30,13 +50,10 @@ main =
      -- create a openai client that automatically retries up to 4 times on network
      -- errors
      let client = makeOpenAIClient apiKey manager 4
-     result <-
-         searchDocuments cli (eId firstEngine) $
-         SearchResultCreate
-         { sccrDocuments = V.fromList ["pool", "gym", "night club"]
-         , sccrQuery = "swimmer"
-         }
-     print result
+     result <- completeChat client request        
+     case result of
+       Left failure -> print failure
+       Right success -> print $ chrChoices success
 ```
 
 ## Features

diff --git a/openai-hs/openai-hs.cabal b/openai-hs/openai-hs.cabal
@@ -1,21 +1,21 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 8760d75e39a4a6db941c2503a8e8519a3c82b52bad91dcf39594cdd9258c7f4b
+-- hash: d37104a564e8bdbce4dfdc276b621def2716ecaad3d474f0646934fd1b1f034b
 
 name:           openai-hs
-version:        0.2.2.0
+version:        0.3.0.1
 synopsis:       Unofficial OpenAI client
 description:    Unofficial OpenAI client
 category:       Web
 homepage:       https://github.com/agrafix/openai-hs#readme
 bug-reports:    https://github.com/agrafix/openai-hs/issues
 author:         Alexander Thiemann <[email protected]>
 maintainer:     Alexander Thiemann <[email protected]>
-copyright:      2021-2022 Alexander Thiemann <[email protected]>
+copyright:      2021-2023 Alexander Thiemann <[email protected]>
 license:        BSD3
 license-file:   LICENSE
 build-type:     Simple
@@ -58,6 +58,7 @@ library
     , http-types
     , openai-servant >=0.2.1
     , servant
+    , servant-auth-client
     , servant-client
     , servant-multipart-client
     , text
@@ -100,6 +101,7 @@ test-suite openai-hs-test
     , openai-hs
     , openai-servant >=0.2.1
     , servant
+    , servant-auth-client
     , servant-client
     , servant-client-core
     , servant-multipart-client

diff --git a/openai-hs/package.yaml b/openai-hs/package.yaml
@@ -1,10 +1,10 @@
 name:                openai-hs
-version:             0.2.2.0
+version:             0.3.0.1
 github:              "agrafix/openai-hs"
 license:             BSD3
 author:              "Alexander Thiemann <[email protected]>"
 maintainer:          "Alexander Thiemann <[email protected]>"
-copyright:           "2021-2022 Alexander Thiemann <[email protected]>"
+copyright:           "2021-2023 Alexander Thiemann <[email protected]>"
 
 extra-source-files:
   - README.md
@@ -21,6 +21,7 @@ dependencies:
   - casing
   - text
   - servant
+  - servant-auth-client
   - servant-client
   - servant-multipart-client
   - http-client