mirror of
https://github.com/shumaiOne/shumai.git
synced 2026-11-22 03:49:33 +00:00
refactor(agent): invoke harness.subscribe directly without typeof check
This commit is contained in:
@@ -56,6 +56,7 @@ describe('Agent Activities', () => {
|
||||
|
||||
it('should call agentChatActivity and prompt the harness', async () => {
|
||||
const mockHarness = {
|
||||
subscribe: vi.fn(),
|
||||
prompt: vi.fn().mockResolvedValue({
|
||||
content: [{ type: 'text', text: 'AI response' }],
|
||||
usage: { input: 10, output: 20 },
|
||||
@@ -185,6 +186,7 @@ describe('Agent Activities', () => {
|
||||
})
|
||||
|
||||
const mockHarness = {
|
||||
subscribe: vi.fn(),
|
||||
prompt: vi.fn().mockReturnValue(promptPromise),
|
||||
abort: vi.fn(),
|
||||
}
|
||||
@@ -252,6 +254,7 @@ describe('Agent Activities', () => {
|
||||
})
|
||||
|
||||
const mockHarness = {
|
||||
subscribe: vi.fn(),
|
||||
prompt: vi.fn().mockReturnValue(promptPromise),
|
||||
abort: vi.fn(),
|
||||
}
|
||||
@@ -312,6 +315,7 @@ describe('Agent Activities', () => {
|
||||
|
||||
it('should include error message in text when stopReason is error', async () => {
|
||||
const mockHarness = {
|
||||
subscribe: vi.fn(),
|
||||
prompt: vi.fn().mockResolvedValue({
|
||||
content: [],
|
||||
usage: { input: 0, output: 0 },
|
||||
@@ -352,6 +356,7 @@ describe('Agent Activities', () => {
|
||||
|
||||
it('should pass thinkingLevel from agent config to createAgentSession', async () => {
|
||||
const mockHarness = {
|
||||
subscribe: vi.fn(),
|
||||
prompt: vi.fn().mockResolvedValue({
|
||||
content: [],
|
||||
usage: { input: 0, output: 0 },
|
||||
@@ -400,6 +405,7 @@ describe('Agent Activities', () => {
|
||||
|
||||
it('should call autofillAiActivity and run autofill tool', async () => {
|
||||
const mockHarness = {
|
||||
subscribe: vi.fn(),
|
||||
prompt: vi.fn().mockResolvedValue({
|
||||
content: [{ type: 'text', text: 'Captured' }],
|
||||
usage: { input: 5, output: 5 },
|
||||
@@ -1040,6 +1046,7 @@ describe('Agent Database Activities Integration', () => {
|
||||
})
|
||||
|
||||
const mockHarness = {
|
||||
subscribe: vi.fn(),
|
||||
prompt: vi.fn().mockResolvedValue({
|
||||
content: [{ type: 'text', text: ' "Summarized Chat Title" ' }],
|
||||
}),
|
||||
|
||||
@@ -219,41 +219,39 @@ If you need to create files in the local filesystem (for example, a temporary fi
|
||||
let grandTotalTokens = 0
|
||||
let totalCost = 0
|
||||
|
||||
if (typeof harness.subscribe === 'function') {
|
||||
harness.subscribe(async (event) => {
|
||||
if (event.type === 'message_end' && event.message.role === 'assistant') {
|
||||
const assistantMsg = event.message
|
||||
const u = assistantMsg.usage
|
||||
if (u) {
|
||||
const inputTokens = u.input || 0
|
||||
const outputTokens = u.output || 0
|
||||
const cacheReadTokens = u.cacheRead || 0
|
||||
const totalTokens = u.totalTokens || inputTokens + outputTokens
|
||||
const cost = u.cost?.total || 0
|
||||
harness.subscribe(async (event) => {
|
||||
if (event.type === 'message_end' && event.message.role === 'assistant') {
|
||||
const assistantMsg = event.message
|
||||
const u = assistantMsg.usage
|
||||
if (u) {
|
||||
const inputTokens = u.input || 0
|
||||
const outputTokens = u.output || 0
|
||||
const cacheReadTokens = u.cacheRead || 0
|
||||
const totalTokens = u.totalTokens || inputTokens + outputTokens
|
||||
const cost = u.cost?.total || 0
|
||||
|
||||
totalInputTokens += inputTokens
|
||||
totalOutputTokens += outputTokens
|
||||
totalCacheReadTokens += cacheReadTokens
|
||||
grandTotalTokens += totalTokens
|
||||
totalCost += cost
|
||||
totalInputTokens += inputTokens
|
||||
totalOutputTokens += outputTokens
|
||||
totalCacheReadTokens += cacheReadTokens
|
||||
grandTotalTokens += totalTokens
|
||||
totalCost += cost
|
||||
|
||||
try {
|
||||
await aiUsageService.recordUsage({
|
||||
teamId: params.teamId,
|
||||
userId: params.userId,
|
||||
inputTokens,
|
||||
outputTokens,
|
||||
cacheReadTokens,
|
||||
totalTokens,
|
||||
cost,
|
||||
})
|
||||
} catch (err) {
|
||||
logger.error({ err }, 'Failed to record AI usage')
|
||||
}
|
||||
try {
|
||||
await aiUsageService.recordUsage({
|
||||
teamId: params.teamId,
|
||||
userId: params.userId,
|
||||
inputTokens,
|
||||
outputTokens,
|
||||
cacheReadTokens,
|
||||
totalTokens,
|
||||
cost,
|
||||
})
|
||||
} catch (err) {
|
||||
logger.error({ err }, 'Failed to record AI usage')
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
const assistantMessage = await harness.prompt(params.prompt, { images: imagesToPass })
|
||||
|
||||
|
||||
@@ -119,7 +119,6 @@ export class AiUsageService {
|
||||
|
||||
since.setMinutes(0, 0, 0)
|
||||
|
||||
|
||||
if (!params.userId) {
|
||||
// Return Team-Level Usage (userId = null)
|
||||
const teamRecords = await prisma.aiUsage.findMany({
|
||||
|
||||
Reference in New Issue
Block a user