finished sam-track

SysCV · Sep 7, 2023 · f249f6c · f249f6c
1 parent 3bd83f3
commit f249f6c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/app/frontend/src/common/algorithm/rle.ts b/app/frontend/src/common/algorithm/rle.ts
@@ -149,7 +149,7 @@ export function shrink(rle: RunLengthEncoding): {rle: RunLengthEncoding; offset:
     yMax = Math.max(y, yMax);
   });
 
-  if (xMin < 0 || yMin < 0) {
+  if (xMax < 0 || yMax < 0) {
     // empty mask
     return undefined;
   }

diff --git a/app/frontend/src/component/panel/TrackOverlay.tsx b/app/frontend/src/component/panel/TrackOverlay.tsx
@@ -31,7 +31,11 @@ function ActiveTrackOverlay({
   const addComponents = useAnnoStore(s => s.addComponents);
 
   const {isLoading} = useQuery({
-    queryKey: [],
+    // prevent cache
+    queryKey: [uuidv4()],
+    retry: false,
+    cacheTime: 0,
+
     queryFn: () => {
       const {rle, offset} = ctx.mask;
       const {
@@ -74,17 +78,22 @@ function ActiveTrackOverlay({
 
       setTracking(undefined);
     },
+    onError: () => {
+      setTracking(undefined);
+    },
   });
 
   return (
     <div {...props}>
-      <Spin spinning={isLoading} />
+      <div style={{width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center'}}>
+        <Spin spinning={isLoading} />
+      </div>
     </div>
   );
 }
 
 function normalizeUrl(str: string): string {
-  if (str.startsWith('')) {
+  if (str.startsWith('/')) {
     return `${window.location.protocol}//${window.location.host}${str}`;
   }
   return str;

diff --git a/app/frontend/src/page/annotate/Panel/Loaded.tsx b/app/frontend/src/page/annotate/Panel/Loaded.tsx
@@ -73,7 +73,7 @@ export const PanelLoaded: FC<{
         />
       </div>
       <TrackOverlay
-        style={{background: 'black', position: 'absolute', left: 0, top: 0, width: '100%', height: '100%'}}
+        style={{background: 'rgba(0,0,0,0.8)', position: 'absolute', left: 0, top: 0, width: '100%', height: '100%'}}
       />
       <SyncingDisableInteractionMask />
       <MonitorAnnotation videoId={video.id} />

diff --git a/module/common/python.go b/module/common/python.go
@@ -19,11 +19,15 @@ func RunPython(ctx context.Context, bin string, args ...string) error {
 
 type PythonRuntime struct {
 	Env []string
+	Dir string
 }
 
 func (r *PythonRuntime) RunPython(ctx context.Context, bin string, args ...string) error {
 	cmd := exec.Command(bin, args...)
 	cmd.Env = r.Env
+	if r.Dir != "" {
+		cmd.Dir = r.Dir
+	}
 	zap.L().Debug("running Python script", zap.String("cmd", cmd.String()), zap.Strings("envs", cmd.Env))
 
 	// redirect and monitor stderr of the subprocess

diff --git a/module/track/server/track.go b/module/track/server/track.go
@@ -46,7 +46,11 @@ func (s *mServer) Track(ctx context.Context, req *servicev1.TrackRequest) (*serv
 
 	// call Python
 	resultPath := taskPath + ".result.json"
-	err = common.RunPython(ctx, s.options.pythonBin, s.options.scriptMain,
+	r := common.PythonRuntime{
+		Dir: filepath.Dir(s.options.scriptMain),
+	}
+	main := filepath.Base(s.options.scriptMain)
+	err = r.RunPython(ctx, s.options.pythonBin, main,
 		"--gpu", fmt.Sprintf("%d", opt.gpuId),
 		"--input", taskPath,
 		"--output", resultPath,