more chnages

Author: clutchski

api/functions/functions.go

@@ -114,22 +114,6 @@ func (a *API) InvokeGlobal(ctx context.Context, req InvokeGlobalParams) (any, er
 	return a.invokePath(ctx, "/function/invoke", req)
 }
 
-// Delete deletes a function by ID.
-func (a *API) Delete(ctx context.Context, functionID string) error {
-	if functionID == "" {
-		return fmt.Errorf("function ID is required")
-	}
-
-	path := fmt.Sprintf("/v1/function/%s", functionID)
-	resp, err := a.client.DELETE(ctx, path)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = resp.Body.Close() }()
-
-	return nil
-}
-
 func (a *API) invokePath(ctx context.Context, path string, req any) (any, error) {
 	resp, err := a.client.POST(ctx, path, req)
 	if err != nil {
@@ -160,3 +144,19 @@ func decodeInvokeResponse(body []byte) (any, error) {
 	}
 	return output, nil
 }
+
+// Delete deletes a function by ID.
+func (a *API) Delete(ctx context.Context, functionID string) error {
+	if functionID == "" {
+		return fmt.Errorf("function ID is required")
+	}
+
+	path := fmt.Sprintf("/v1/function/%s", functionID)
+	resp, err := a.client.DELETE(ctx, path)
+	if err != nil {
+		return err
+	}
+	defer func() { _ = resp.Body.Close() }()
+
+	return nil
+}

eval/eval.go

@@ -480,11 +480,10 @@ func (e *eval[I, R]) runCase(ctx context.Context, span oteltrace.Span, c Case[I,
 }
 
 func rootSpanIDFromSpan(span oteltrace.Span) string {
-	sc := span.SpanContext()
-	if sc.TraceID().IsValid() {
-		return sc.TraceID().String()
+	if span == nil {
+		return ""
 	}
-	return sc.SpanID().String()
+	return span.SpanContext().TraceID().String()
 }
 
 // runTask executes the task function and creates a task span.

eval/eval_test.go

@@ -2,23 +2,17 @@ package eval
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"io"
-	"net/http"
-	"net/http/httptest"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 
-	"github.com/braintrustdata/braintrust-sdk-go/api"
-	"github.com/braintrustdata/braintrust-sdk-go/internal/auth"
 	"github.com/braintrustdata/braintrust-sdk-go/internal/oteltest"
 	"github.com/braintrustdata/braintrust-sdk-go/internal/tests"
-	"github.com/braintrustdata/braintrust-sdk-go/logger"
 	"github.com/braintrustdata/braintrust-sdk-go/trace"
 )
 
@@ -264,77 +258,6 @@ func TestNewEval_DefaultParallelism(t *testing.T) {
 	assert.Equal(t, 1, ute2.eval.goroutines)
 }
 
-func TestEval_Run_TraceRefUsesRootTraceID(t *testing.T) {
-	t.Parallel()
-
-	var gotRootSpanID string
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		require.Equal(t, http.MethodPost, r.Method)
-		require.Equal(t, "/function/invoke", r.URL.Path)
-
-		var body map[string]any
-		require.NoError(t, json.NewDecoder(r.Body).Decode(&body))
-
-		input, ok := body["input"].(map[string]any)
-		require.True(t, ok)
-		traceRef, ok := input["trace_ref"].(map[string]any)
-		require.True(t, ok)
-		gotRootSpanID, _ = traceRef["root_span_id"].(string)
-
-		require.NoError(t, json.NewEncoder(w).Encode([]map[string]any{
-			{"role": "user", "content": "hello"},
-		}))
-	}))
-	defer server.Close()
-
-	tp, _ := oteltest.Setup(t)
-	tracer := tp.Tracer(t.Name())
-	session := auth.NewTestSession(
-		"test-key",
-		"org-id",
-		"org-name",
-		server.URL,
-		server.URL,
-		server.URL,
-		logger.Discard(),
-	)
-
-	cases := NewDataset([]Case[testInput, testOutput]{
-		{
-			Input:    testInput{Value: "abc"},
-			Expected: testOutput{Result: "output-abc"},
-		},
-	})
-	task := T(func(ctx context.Context, input testInput) (testOutput, error) {
-		return testOutput{Result: "output-" + input.Value}, nil
-	})
-	scorer := NewScorer("thread", func(ctx context.Context, result TaskResult[testInput, testOutput]) (Scores, error) {
-		_, _ = result.Thread(ctx)
-		return S(1), nil
-	})
-
-	apiClient := api.NewClient("test-key", api.WithAPIURL(server.URL))
-
-	e := testNewEval(
-		session,
-		tracer,
-		apiClient,
-		"exp-123",
-		"test-exp",
-		"proj-123",
-		"test-proj",
-		cases,
-		task,
-		[]Scorer[testInput, testOutput]{scorer},
-		1,
-	)
-
-	_, err := e.run(context.Background())
-	require.NoError(t, err)
-	require.NotEmpty(t, gotRootSpanID)
-	assert.Regexp(t, "^[0-9a-f]{32}$", gotRootSpanID, "root_span_id should use trace/root ID format")
-}
-
 func TestEval_Run_TaskError(t *testing.T) {
 	t.Parallel()
 

internal/auth/auth_test.go

@@ -353,25 +353,6 @@ func TestSession_APIInfo(t *testing.T) {
 	})
 }
 
-func TestSession_API(t *testing.T) {
-	t.Parallel()
-
-	session := NewTestSession(
-		"test-key-123",
-		"org-id",
-		"org-name",
-		"https://api.braintrust.dev",
-		"https://www.braintrust.dev",
-		"https://www.braintrust.dev",
-		logger.Discard(),
-	)
-
-	apiClient := session.API()
-	require.NotNil(t, apiClient)
-	require.NotNil(t, apiClient.Functions())
-	require.NotNil(t, apiClient.Objects())
-}
-
 // TestSession_OrgName tests that OrgName() returns org name after login
 func TestSession_OrgName(t *testing.T) {
 	t.Parallel()

internal/auth/session.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/braintrustdata/braintrust-sdk-go/api"
 	"github.com/braintrustdata/braintrust-sdk-go/internal/https"
 	"github.com/braintrustdata/braintrust-sdk-go/logger"
 )
@@ -126,18 +125,6 @@ func (s *Session) APIInfo() APIInfo {
 	}
 }
 
-// API returns an API client configured from the current session.
-// It uses APIInfo() so it works before login completes and automatically
-// picks up server-provided APIURL once available.
-func (s *Session) API() *api.API {
-	apiInfo := s.APIInfo()
-	return api.NewClient(
-		apiInfo.APIKey,
-		api.WithAPIURL(apiInfo.APIURL),
-		api.WithLogger(s.logger),
-	)
-}
-
 func (s *Session) getLoginResult() (bool, *loginResult) {
 	s.mu.RLock()
 	defer s.mu.RUnlock()