wip

Author: sergei-bronnikov

internal/message/handler.go

@@ -707,18 +707,6 @@ func (h *Handler) decorateEvent(m Message) error {
 		}
 	}
 
-	//if strings.HasPrefix(e.Event.Path, "/api/providers/openai/v1/responses") {
-	//	responsesReq, ok := e.Request.(*openai.ResponseRequest)
-	//	if !ok {
-	//		telemetry.Incr("bricksllm.message.handler.decorate_event.event_request_parsing_error", nil, 1)
-	//		h.log.Debug("event contains data that cannot be converted to responses api request", zap.Any("data", m.Data))
-	//		return errors.New("event request data cannot be parsed as responses api request")
-	//	}
-	//	if gopointer.ToValueOrDefault(responsesReq.Stream, false) {
-	//		fmt.Println("------------- estimating for responses api request --------------")
-	//	}
-	//}
-
 	if e.Event.Path == "/api/providers/vllm/v1/chat/completions" {
 		ccr, ok := e.Request.(*vllm.ChatRequest)
 		if !ok {

internal/server/web/proxy/middleware.go

@@ -809,8 +809,7 @@ func getMiddleware(cpm CustomProvidersManager, rm routeManager, pm PoliciesManag
 			enrichedEvent.Request = responsesReq
 			c.Set("model", gopointer.ToValueOrDefault(responsesReq.Model, ""))
 
-			// TODO: log
-			//logRequest(logWithCid, prod, private, responsesReq)
+			logResponsesRequest(logWithCid, prod, private, responsesReq)
 
 			if gopointer.ToValueOrDefault(responsesReq.Stream, false) {
 				c.Set("stream", true)

internal/server/web/proxy/proxy.go

@@ -17,10 +17,13 @@ import (
 	"github.com/bricks-cloud/bricksllm/internal/policy"
 	"github.com/bricks-cloud/bricksllm/internal/provider"
 	"github.com/bricks-cloud/bricksllm/internal/provider/custom"
+	"github.com/bricks-cloud/bricksllm/internal/provider/openai"
 	"github.com/bricks-cloud/bricksllm/internal/telemetry"
 	"github.com/bricks-cloud/bricksllm/internal/util"
 	"github.com/gin-gonic/gin"
+	responsesOpenai "github.com/openai/openai-go/responses"
 	goopenai "github.com/sashabaranov/go-openai"
+	gopointer "github.com/sergei-bronnikov/go-pointer"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
@@ -1344,6 +1347,38 @@ func logRequest(log *zap.Logger, prod, private bool, r *goopenai.ChatCompletionR
 	}
 }
 
+func logResponsesRequest(log *zap.Logger, prod, private bool, r *openai.ResponseRequest) {
+	if prod {
+		fields := []zapcore.Field{
+			zap.Time("createdAt", time.Now()),
+			zap.String("model", gopointer.ToValueOrDefault(r.Model, "unknown")),
+			zap.Bool("stream", gopointer.ToValueOrDefault(r.Stream, false)),
+		}
+
+		if !private {
+			fields = append(fields, zap.Any("input", r.Input))
+		}
+
+		log.Info("openai responses request", fields...)
+	}
+}
+
+func logResponsesResponse(log *zap.Logger, prod, private bool, r *responsesOpenai.Response) {
+	if prod {
+		fields := []zapcore.Field{
+			zap.Time("createdAt", time.Now()),
+			zap.String("model", r.Model),
+			zap.String("id", r.ID),
+		}
+
+		if !private {
+			fields = append(fields, zap.Any("output", r.OutputText()))
+		}
+
+		log.Info("openai responses request", fields...)
+	}
+}
+
 func logOpenAiError(log *zap.Logger, prod bool, errRes *goopenai.ErrorResponse) {
 	if prod {
 		log.Info("openai error response", zap.Any("error", errRes))

internal/server/web/proxy/responses.go

@@ -43,7 +43,6 @@ func getResponsesHandler(prod, private bool, client http.Client, e estimator) gi
 
 		copyHttpHeaders(c.Request, req, c.GetBool("removeUserAgent"))
 
-		// TODO
 		isStreaming := c.GetBool("stream")
 		if isStreaming {
 			req.Header.Set("Accept", "text/event-stream")
@@ -91,17 +90,14 @@ func getResponsesHandler(prod, private bool, client http.Client, e estimator) gi
 			if err != nil {
 				logError(log, "error when unmarshalling openai http response api response body", prod, err)
 			}
-			//	TODO: implement non-streaming logic here
 
 			if err == nil {
-				// TODO log
-				//logChatCompletionResponse(log, prod, private, chatRes)
+				logResponsesResponse(log, prod, private, resp)
 				cost, err = e.EstimateResponseApiTotalCost(model, resp.Usage)
 				if err != nil {
 					telemetry.Incr("bricksllm.proxy.get_chat_completion_handler.estimate_total_cost_error", nil, 1)
 					logError(log, "error when estimating openai cost", prod, err)
 				}
-				//m, exists := c.Get("cost_map")
 			}
 
 			c.Set("costInUsd", cost)