Skip to content

Commit 8b699c0

Browse files
authored
Merge pull request #23 from vxcontrol/bug/fixes_frontend_issues
Fixed various frontend issues
2 parents 8b0f958 + 0a6f78e commit 8b699c0

24 files changed

+794
-274
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ frontend/coverage
1010
frontend/dist
1111
frontend/node_modules
1212
frontend/ssl
13+
node_modules
1314

1415
build/*
1516
data/*

backend/pkg/controller/flow.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,9 @@ func (fw *flowWorker) Stop(ctx context.Context) error {
480480

481481
func (fw *flowWorker) stop() error {
482482
if err := fw.ctx.Err(); err != nil {
483+
if errors.Is(err, context.Canceled) {
484+
return nil
485+
}
483486
return fmt.Errorf("flow %d stop failed: %w", fw.flowCtx.FlowID, err)
484487
}
485488

backend/pkg/graph/schema.resolvers.go

Lines changed: 12 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/pkg/providers/provider.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ const TasksNumberLimit = 15
2323

2424
const summarizeLimit = 16 * 1024 // 16 KB
2525

26+
const contextHardLimit = 100 * 1024 // 100 KB
27+
2628
type PerformResult int
2729

2830
const (
@@ -189,6 +191,10 @@ func (fp *flowProvider) GenerateSubtasks(ctx context.Context, taskID int64) ([]t
189191
return nil, wrapErrorEndSpan(ctx, generatorSpan, "failed to get task generator template", err)
190192
}
191193

194+
if len(generatorTmpl) > contextHardLimit {
195+
generatorTmpl = generatorTmpl[:contextHardLimit] + "\n\n[...truncated]"
196+
}
197+
192198
systemGeneratorTmpl, err := fp.prompter.RenderTemplate(templates.PromptTypeGenerator, generatorContext["system"])
193199
if err != nil {
194200
return nil, wrapErrorEndSpan(ctx, generatorSpan, "failed to get task system generator template", err)
@@ -254,6 +260,10 @@ func (fp *flowProvider) RefineSubtasks(ctx context.Context, taskID int64) ([]too
254260
return nil, wrapErrorEndSpan(ctx, refinerSpan, "failed to get task subtasks refiner template", err)
255261
}
256262

263+
if len(refinerTmpl) > contextHardLimit {
264+
refinerTmpl = refinerTmpl[:contextHardLimit] + "\n\n[...truncated]"
265+
}
266+
257267
systemRefinerTmpl, err := fp.prompter.RenderTemplate(templates.PromptTypeRefiner, refinerContext["system"])
258268
if err != nil {
259269
return nil, wrapErrorEndSpan(ctx, refinerSpan, "failed to get task system refiner template", err)
@@ -324,6 +334,10 @@ func (fp *flowProvider) GetTaskResult(ctx context.Context, taskID int64) (*tools
324334
return nil, wrapErrorEndSpan(ctx, reporterSpan, "failed to get task reporter template", err)
325335
}
326336

337+
if len(reporterTmpl) > contextHardLimit {
338+
reporterTmpl = reporterTmpl[:contextHardLimit] + "\n\n[...truncated]"
339+
}
340+
327341
systemReporterTmpl, err := fp.prompter.RenderTemplate(templates.PromptTypeReporter, reporterContext["system"])
328342
if err != nil {
329343
return nil, wrapErrorEndSpan(ctx, reporterSpan, "failed to get task system reporter template", err)

frontend/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ApolloProvider } from '@apollo/client';
22
import { Suspense } from 'react';
3-
import type { NavigateFunction } from 'react-router-dom';
3+
import type { Location, NavigateFunction } from 'react-router-dom';
44
import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
55

66
import AppLayout from '@/components/AppLayout';

frontend/src/components/RouteChangeTracker.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
import { useEffect } from 'react';
2+
import type { Location, NavigateFunction } from 'react-router-dom';
23
import { useLocation, useNavigate } from 'react-router-dom';
34

4-
const RouteChangeTracker = ({ onRouteChange }) => {
5+
interface RouteChangeTrackerProps {
6+
onRouteChange: (params: { navigate: NavigateFunction; location: Location }) => void;
7+
}
8+
9+
const RouteChangeTracker = ({ onRouteChange }: RouteChangeTrackerProps) => {
510
const navigate = useNavigate();
611
const location = useLocation();
712

0 commit comments

Comments
 (0)