#131: Update test files

docs/docs.go

@@ -256,6 +256,52 @@ const docTemplate = `{
                 }
             }
         },
+        "bedrock.Config": {
+            "type": "object",
+            "required": [
+                "awsRegion",
+                "baseUrl",
+                "chatEndpoint",
+                "model"
+            ],
+            "properties": {
+                "awsRegion": {
+                    "type": "string"
+                },
+                "baseUrl": {
+                    "type": "string"
+                },
+                "chatEndpoint": {
+                    "type": "string"
+                },
+                "defaultParams": {
+                    "$ref": "#/definitions/bedrock.Params"
+                },
+                "model": {
+                    "type": "string"
+                }
+            }
+        },
+        "bedrock.Params": {
+            "type": "object",
+            "properties": {
+                "max_tokens": {
+                    "type": "integer"
+                },
+                "stop": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "temperature": {
+                    "type": "number"
+                },
+                "top_p": {
+                    "type": "number"
+                }
+            }
+        },
         "clients.ClientConfig": {
             "type": "object",
             "properties": {
@@ -517,6 +563,9 @@ const docTemplate = `{
                 "azureopenai": {
                     "$ref": "#/definitions/azureopenai.Config"
                 },
+                "bedrock": {
+                    "$ref": "#/definitions/bedrock.Config"
+                },
                 "client": {
                     "$ref": "#/definitions/clients.ClientConfig"
                 },

docs/swagger.json

@@ -253,6 +253,52 @@
                 }
             }
         },
+        "bedrock.Config": {
+            "type": "object",
+            "required": [
+                "awsRegion",
+                "baseUrl",
+                "chatEndpoint",
+                "model"
+            ],
+            "properties": {
+                "awsRegion": {
+                    "type": "string"
+                },
+                "baseUrl": {
+                    "type": "string"
+                },
+                "chatEndpoint": {
+                    "type": "string"
+                },
+                "defaultParams": {
+                    "$ref": "#/definitions/bedrock.Params"
+                },
+                "model": {
+                    "type": "string"
+                }
+            }
+        },
+        "bedrock.Params": {
+            "type": "object",
+            "properties": {
+                "max_tokens": {
+                    "type": "integer"
+                },
+                "stop": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "temperature": {
+                    "type": "number"
+                },
+                "top_p": {
+                    "type": "number"
+                }
+            }
+        },
         "clients.ClientConfig": {
             "type": "object",
             "properties": {
@@ -514,6 +560,9 @@
                 "azureopenai": {
                     "$ref": "#/definitions/azureopenai.Config"
                 },
+                "bedrock": {
+                    "$ref": "#/definitions/bedrock.Config"
+                },
                 "client": {
                     "$ref": "#/definitions/clients.ClientConfig"
                 },

docs/swagger.yaml

@@ -90,6 +90,37 @@ definitions:
       user:
         type: string
     type: object
+  bedrock.Config:
+    properties:
+      awsRegion:
+        type: string
+      baseUrl:
+        type: string
+      chatEndpoint:
+        type: string
+      defaultParams:
+        $ref: '#/definitions/bedrock.Params'
+      model:
+        type: string
+    required:
+    - awsRegion
+    - baseUrl
+    - chatEndpoint
+    - model
+    type: object
+  bedrock.Params:
+    properties:
+      max_tokens:
+        type: integer
+      stop:
+        items:
+          type: string
+        type: array
+      temperature:
+        type: number
+      top_p:
+        type: number
+    type: object
   clients.ClientConfig:
     properties:
       timeout:
@@ -262,6 +293,8 @@ definitions:
         $ref: '#/definitions/anthropic.Config'
       azureopenai:
         $ref: '#/definitions/azureopenai.Config'
+      bedrock:
+        $ref: '#/definitions/bedrock.Config'
       client:
         $ref: '#/definitions/clients.ClientConfig'
       cohere:

pkg/providers/bedrock/client.go

@@ -9,12 +9,8 @@ import (
 	"glide/pkg/telemetry"
 )
 
-// TODO: Explore resource pooling
-// TODO: Optimize Type use
-// TODO: Explore Hertz TLS & resource pooling
-
 const (
-	providerName = "openai"
+	providerName = "bedrock"
 )
 
 // ErrEmptyResponse is returned when the OpenAI API returns an empty response.

pkg/providers/bedrock/client_test.go

@@ -20,8 +20,7 @@ import (
 )
 
 func TestBedrockClient_ChatRequest(t *testing.T) {
-	// OpenAI Chat API: https://platform.openai.com/docs/api-reference/chat/create
-	openAIMock := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	bedrockMock := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		rawPayload, _ := io.ReadAll(r.Body)
 
 		var data interface{}
@@ -44,20 +43,20 @@ func TestBedrockClient_ChatRequest(t *testing.T) {
 		}
 	})
 
-	openAIServer := httptest.NewServer(openAIMock)
-	defer openAIServer.Close()
+	BedrockServer := httptest.NewServer(bedrockMock)
+	defer BedrockServer.Close()
 
 	ctx := context.Background()
 	providerCfg := DefaultConfig()
 	clientCfg := clients.DefaultClientConfig()
 
-	providerCfg.BaseURL = openAIServer.URL
+	providerCfg.BaseURL = BedrockServer.URL
 
 	client, err := NewClient(providerCfg, clientCfg, telemetry.NewTelemetryMock())
 	require.NoError(t, err)
 
 	request := schemas.UnifiedChatRequest{Message: schemas.ChatMessage{
-		Role:    "human",
+		Role:    "user",
 		Content: "What's the biggest animal?",
 	}}
 

pkg/providers/bedrock/testdata/chat.req.json

@@ -1,15 +1,12 @@
 {
-  "model": "gpt-3.5-turbo",
+  "model": "amazon.titan-text-express-v1",
   "messages": [
     {
-      "role": "human",
+      "role": "user",
       "content": "What's the biggest animal?"
     }
   ],
   "temperature": 0.8,
   "top_p": 1,
-  "max_tokens": 100,
-  "n": 1,
-  "user": null,
-  "seed": null
+  "max_tokens": 100
 }

pkg/providers/bedrock/testdata/chat.success.json

@@ -1,21 +1 @@
-{
-  "id": "chatcmpl-123",
-  "object": "chat.completion",
-  "created": 1677652288,
-  "model": "gpt-3.5-turbo-0613",
-  "system_fingerprint": "fp_44709d6fcb",
-  "choices": [{
-    "index": 0,
-    "message": {
-      "role": "assistant",
-      "content": "\n\nHello there, how may I assist you today?"
-    },
-    "logprobs": null,
-    "finish_reason": "stop"
-  }],
-  "usage": {
-    "prompt_tokens": 9,
-    "completion_tokens": 12,
-    "total_tokens": 21
-  }
-}
+{"provider":"bedrock","model":"amazon.titan-text-express-v1","modelResponse":{"responseId":{"system_fingerprint":""},"message":{"role":"assistant","content":"\nThe largest animal in the world is the blue whale, which can reach lengths of over 100 feet and weigh as much as 200 tons."},"tokenCount":{"promptTokens":34,"responseTokens":34,"totalTokens":34}}}

pkg/providers/openai/client_test.go

@@ -57,7 +57,7 @@ func TestOpenAIClient_ChatRequest(t *testing.T) {
 	require.NoError(t, err)
 
 	request := schemas.UnifiedChatRequest{Message: schemas.ChatMessage{
-		Role:    "human",
+		Role:    "user",
 		Content: "What's the biggest animal?",
 	}}