chore: clean up

Signed-off-by: Danny Kopping <[email protected]>

Author: dannykopping

intercept_anthropic_messages_blocking.go

@@ -57,7 +57,7 @@ func (i *AnthropicMessagesBlockingInterception) ProcessRequest(w http.ResponseWr
 
 	opts := []option.RequestOption{option.WithRequestTimeout(time.Second * 60)} // TODO: configurable timeout
 
-	client := newAnthropicClient(i.cfg, i.id.String(), i.Model(), opts...)
+	client := newAnthropicClient(i.logger, i.cfg, i.id.String(), i.Model(), opts...)
 	messages := i.req.MessageNewParams
 	logger := i.logger.With(slog.F("model", i.req.Model))
 

intercept_anthropic_messages_streaming.go

@@ -94,7 +94,7 @@ func (i *AnthropicMessagesStreamingInterception) ProcessRequest(w http.ResponseW
 		_ = events.Shutdown(streamCtx) // Catch-all in case it doesn't get shutdown after stream completes.
 	}()
 
-	client := newAnthropicClient(i.cfg, i.id.String(), i.Model())
+	client := newAnthropicClient(i.logger, i.cfg, i.id.String(), i.Model())
 	messages := i.req.MessageNewParams
 
 	// Accumulate usage across the entire streaming interaction (including tool reinvocations).

intercept_openai_chat_blocking.go

@@ -41,7 +41,7 @@ func (i *OpenAIBlockingChatInterception) ProcessRequest(w http.ResponseWriter, r
 	}
 
 	ctx := r.Context()
-	client := newOpenAIClient(i.cfg, i.id.String(), i.Model())
+	client := newOpenAIClient(i.logger, i.cfg, i.id.String(), i.Model())
 	logger := i.logger.With(slog.F("model", i.req.Model))
 
 	var (

intercept_openai_chat_streaming.go

@@ -64,7 +64,7 @@ func (i *OpenAIStreamingChatInterception) ProcessRequest(w http.ResponseWriter,
 	defer cancel()
 	r = r.WithContext(ctx) // Rewire context for SSE cancellation.
 
-	client := newOpenAIClient(i.cfg, i.id.String(), i.Model())
+	client := newOpenAIClient(i.logger, i.cfg, i.id.String(), i.Model())
 	logger := i.logger.With(slog.F("model", i.req.Model))
 
 	streamCtx, streamCancel := context.WithCancelCause(ctx)

provider_anthropic.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 
+	"cdr.dev/slog"
 	"github.com/anthropics/anthropic-sdk-go"
 	"github.com/anthropics/anthropic-sdk-go/option"
 	"github.com/anthropics/anthropic-sdk-go/shared"
@@ -98,12 +99,12 @@ func (p *AnthropicProvider) InjectAuthHeader(headers *http.Header) {
 	headers.Set(p.AuthHeader(), p.cfg.Key)
 }
 
-func newAnthropicClient(cfg *ProviderConfig, id, model string, opts ...option.RequestOption) anthropic.Client {
+func newAnthropicClient(logger slog.Logger, cfg *ProviderConfig, id, model string, opts ...option.RequestOption) anthropic.Client {
 	opts = append(opts, option.WithAPIKey(cfg.Key))
 	opts = append(opts, option.WithBaseURL(cfg.BaseURL))
 
 	if cfg.EnableUpstreamLogging() {
-		if middleware := createLoggingMiddleware("anthropic", id, model); middleware != nil {
+		if middleware := createLoggingMiddleware(logger, "anthropic", id, model); middleware != nil {
 			opts = append(opts, option.WithMiddleware(middleware))
 		}
 	}

provider_openai.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"os"
 
+	"cdr.dev/slog"
 	"github.com/google/uuid"
 	"github.com/openai/openai-go/v2"
 	"github.com/openai/openai-go/v2/option"
@@ -100,13 +101,13 @@ func (p *OpenAIProvider) InjectAuthHeader(headers *http.Header) {
 	headers.Set(p.AuthHeader(), "Bearer "+p.cfg.Key)
 }
 
-func newOpenAIClient(cfg *ProviderConfig, id, model string) openai.Client {
+func newOpenAIClient(logger slog.Logger, cfg *ProviderConfig, id, model string) openai.Client {
 	var opts []option.RequestOption
 	opts = append(opts, option.WithAPIKey(cfg.Key))
 	opts = append(opts, option.WithBaseURL(cfg.BaseURL))
 
 	if cfg.EnableUpstreamLogging() {
-		if middleware := createLoggingMiddleware("openai", id, model); middleware != nil {
+		if middleware := createLoggingMiddleware(logger, "openai", id, model); middleware != nil {
 			opts = append(opts, option.WithMiddleware(middleware))
 		}
 	}

request_logger.go

@@ -1,12 +1,35 @@
 package aibridge
 
 import (
+	"context"
+	"fmt"
 	"log"
 	"net/http"
 	"net/http/httputil"
 	"os"
+	"path/filepath"
+	"strings"
+
+	"cdr.dev/slog"
 )
 
+// sanitizeModelName makes a model name safe for use as a directory name.
+// Replaces filesystem-unsafe characters with underscores.
+func sanitizeModelName(model string) string {
+	replacer := strings.NewReplacer(
+		"/", "_",
+		"\\", "_",
+		":", "_",
+		"*", "_",
+		"?", "_",
+		"\"", "_",
+		"<", "_",
+		">", "_",
+		"|", "_",
+	)
+	return replacer.Replace(model)
+}
+
 // logUpstreamRequest logs an HTTP request with the given ID and model name.
 // The prefix format is: [req] [id] [model]
 func logUpstreamRequest(logger *log.Logger, id, model string, req *http.Request) {
@@ -42,16 +65,32 @@ func logUpstreamError(logger *log.Logger, id, model string, err error) {
 }
 
 // createLoggingMiddleware creates a middleware function that logs requests and responses.
-// Returns nil if logging setup fails.
-func createLoggingMiddleware(provider, id, model string) func(*http.Request, func(*http.Request) (*http.Response, error)) (*http.Response, error) {
-	reqLogFile, err := os.OpenFile("/tmp/"+provider+"-req.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
+// Logs are written to $TMPDIR/$provider/$model/$id.req.log and $TMPDIR/$provider/$model/$id.res.log
+// Returns nil if logging setup fails, logging errors via the provided logger.
+func createLoggingMiddleware(logger slog.Logger, provider, id, model string) func(*http.Request, func(*http.Request) (*http.Response, error)) (*http.Response, error) {
+	ctx := context.Background()
+	safeModel := sanitizeModelName(model)
+	logDir := filepath.Join(os.TempDir(), provider, safeModel)
+
+	// Create the directory structure if it doesn't exist
+	if err := os.MkdirAll(logDir, 0755); err != nil {
+		logger.Warn(ctx, "failed to create log directory", slog.Error(err), slog.F("dir", logDir))
+		return nil
+	}
+
+	reqLogPath := filepath.Join(logDir, fmt.Sprintf("%s.req.log", id))
+	resLogPath := filepath.Join(logDir, fmt.Sprintf("%s.res.log", id))
+
+	reqLogFile, err := os.OpenFile(reqLogPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
 	if err != nil {
+		logger.Warn(ctx, "failed to open request log file", slog.Error(err), slog.F("path", reqLogPath))
 		return nil
 	}
 
-	resLogFile, err := os.OpenFile("/tmp/"+provider+"-res.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
+	resLogFile, err := os.OpenFile(resLogPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
 	if err != nil {
 		reqLogFile.Close()
+		logger.Warn(ctx, "failed to open response log file", slog.Error(err), slog.F("path", resLogPath))
 		return nil
 	}