Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4d033bf

Browse files
committed
review 2
1 parente6efcd1 commit4d033bf

File tree

3 files changed

+22
-41
lines changed

3 files changed

+22
-41
lines changed

‎enterprise/aibridged/aibridged_integration_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ func TestIntegration(t *testing.T) {
232232
require.Equal(t,"gpt-4.1",intc0.Model)
233233
require.True(t,intc0.EndedAt.Valid)
234234
require.WithinDuration(t,dbtime.Now(),intc0.EndedAt.Time,10*time.Second)
235+
require.WithinDuration(t,dbtime.Now(),intc0.StartedAt,10*time.Second)
236+
require.True(t,intc0.StartedAt.Before(intc0.EndedAt.Time))
235237

236238
prompts,err:=db.GetAIBridgeUserPromptsByInterceptionID(ctx,interceptions[0].ID)
237239
require.NoError(t,err)

‎enterprise/aibridgedserver/aibridgedserver.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,21 +114,19 @@ func (s *Server) RecordInterception(ctx context.Context, in *proto.RecordInterce
114114
iferr!=nil {
115115
returnnil,xerrors.Errorf("invalid initiator ID %q: %w",in.GetInitiatorId(),err)
116116
}
117+
ifin.ApiKeyId=="" {
118+
returnnil,xerrors.Errorf("empty API key ID")
119+
}
117120

118-
params:= database.InsertAIBridgeInterceptionParams{
121+
_,err=s.store.InsertAIBridgeInterception(ctx, database.InsertAIBridgeInterceptionParams{
119122
ID:intcID,
120-
APIKeyID: sql.NullString{Valid:false},
123+
APIKeyID: sql.NullString{String:in.ApiKeyId,Valid:true},
121124
InitiatorID:initID,
122125
Provider:in.Provider,
123126
Model:in.Model,
124127
Metadata:marshalMetadata(ctx,s.logger,in.GetMetadata()),
125128
StartedAt:in.StartedAt.AsTime(),
126-
}
127-
ifin.ApiKeyId!="" {
128-
params.APIKeyID= sql.NullString{String:in.ApiKeyId,Valid:true}
129-
}
130-
131-
_,err=s.store.InsertAIBridgeInterception(ctx,params)
129+
})
132130
iferr!=nil {
133131
returnnil,xerrors.Errorf("start interception: %w",err)
134132
}

‎enterprise/aibridgedserver/aibridgedserver_test.go‎

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -392,65 +392,46 @@ func TestRecordInterception(t *testing.T) {
392392
},
393393
},
394394
{
395-
name:"valid interceptionno api key set",
395+
name:"invalid interceptionID",
396396
request:&proto.RecordInterceptionRequest{
397-
Id:uuid.NewString(),
397+
Id:"not-a-uuid",
398398
InitiatorId:uuid.NewString(),
399+
ApiKeyId:uuid.NewString(),
399400
Provider:"anthropic",
400401
Model:"claude-4-opus",
401-
Metadata:metadataProto,
402402
StartedAt:timestamppb.Now(),
403403
},
404-
setupMocks:func(t*testing.T,db*dbmock.MockStore,req*proto.RecordInterceptionRequest) {
405-
interceptionID,err:=uuid.Parse(req.GetId())
406-
assert.NoError(t,err,"parse interception UUID")
407-
initiatorID,err:=uuid.Parse(req.GetInitiatorId())
408-
assert.NoError(t,err,"parse interception initiator UUID")
409-
410-
db.EXPECT().InsertAIBridgeInterception(gomock.Any(), database.InsertAIBridgeInterceptionParams{
411-
ID:interceptionID,
412-
APIKeyID: sql.NullString{String:"",Valid:false},
413-
InitiatorID:initiatorID,
414-
Provider:req.GetProvider(),
415-
Model:req.GetModel(),
416-
Metadata:json.RawMessage(metadataJSON),
417-
StartedAt:req.StartedAt.AsTime().UTC(),
418-
}).Return(database.AIBridgeInterception{
419-
ID:interceptionID,
420-
APIKeyID: sql.NullString{String:"",Valid:false},
421-
InitiatorID:initiatorID,
422-
Provider:req.GetProvider(),
423-
Model:req.GetModel(),
424-
StartedAt:req.StartedAt.AsTime().UTC(),
425-
},nil)
426-
},
404+
expectedErr:"invalid interception ID",
427405
},
428406
{
429-
name:"invalidinterception ID",
407+
name:"invalidinitiator ID",
430408
request:&proto.RecordInterceptionRequest{
431-
Id:"not-a-uuid",
432-
InitiatorId:uuid.NewString(),
409+
Id:uuid.NewString(),
410+
ApiKeyId:uuid.NewString(),
411+
InitiatorId:"not-a-uuid",
433412
Provider:"anthropic",
434413
Model:"claude-4-opus",
435414
StartedAt:timestamppb.Now(),
436415
},
437-
expectedErr:"invalidinterception ID",
416+
expectedErr:"invalidinitiator ID",
438417
},
439418
{
440-
name:"invalidinitiator ID",
419+
name:"invalidinterception no api key set",
441420
request:&proto.RecordInterceptionRequest{
442421
Id:uuid.NewString(),
443-
InitiatorId:"not-a-uuid",
422+
InitiatorId:uuid.NewString(),
444423
Provider:"anthropic",
445424
Model:"claude-4-opus",
425+
Metadata:metadataProto,
446426
StartedAt:timestamppb.Now(),
447427
},
448-
expectedErr:"invalid initiator ID",
428+
expectedErr:"empty API key ID",
449429
},
450430
{
451431
name:"database error",
452432
request:&proto.RecordInterceptionRequest{
453433
Id:uuid.NewString(),
434+
ApiKeyId:uuid.NewString(),
454435
InitiatorId:uuid.NewString(),
455436
Provider:"anthropic",
456437
Model:"claude-4-opus",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp