@evergis/react 4.0.31 → 4.0.32

package/dist/hooks/task/constants.d.ts

@@ -1,4 +1,5 @@
 export declare const SERVER_NOTIFICATION_EVENT: {
     ReceiveFeaturesUpdate: string;
     PythonProgressNotification: string;
+    PythonSandboxStats: string;
 };

package/dist/hooks/task/index.d.ts

@@ -1,3 +1,4 @@
 export * from './constants';
 export * from './usePythonTask';
+export * from './usePythonSandbox';
 export * from './types';

package/dist/hooks/task/types.d.ts

@@ -1,7 +1,7 @@
 import { RemoteTaskStatus } from '@evergis/api';
 export interface PythonTaskProgressSubscription {
     tag: "python_task_progress_event";
-    taskId: string;
+    resourceId: string;
 }
 export interface PythonTaskProgressNotification {
     data: {
@@ -14,3 +14,7 @@ export interface PythonTaskProgressNotification {
     tag: string;
     createdAt: string;
 }
+export interface PythonSandbox {
+    path: string;
+    sandboxId: string;
+}

package/dist/hooks/task/usePythonSandbox.d.ts

@@ -0,0 +1,7 @@
+import { PythonSandbox } from './types';
+export declare const usePythonSandbox: () => {
+    preparePythonSandbox: ({ resourceId, isNotebook }: {
+        resourceId: string;
+        isNotebook?: boolean;
+    }) => Promise<PythonSandbox>;
+};

package/dist/index.js

@@ -5392,11 +5392,23 @@ const useServerNotificationsContext = () => {
 const SERVER_NOTIFICATION_EVENT = {
     ReceiveFeaturesUpdate: "ReceiveFeaturesUpdateNotification",
     PythonProgressNotification: "ReceivePythonProgressNotification",
+    PythonSandboxStats: "ReceivePythonSandboxStatsNotification",
+};
+
+const usePythonSandbox = () => {
+    const { api } = useGlobalContext();
+    const preparePythonSandbox = React.useCallback(({ resourceId, isNotebook = false }) => api.remoteTaskManager.post({
+        workerType: "pythonService",
+        methodType: "pythonrunner/prepare",
+        data: { resourceId, isNotebook },
+    }), [api.remoteTaskManager]);
+    return { preparePythonSandbox };
 };
 
 const usePythonTask = () => {
     const { api: api$1, t } = useGlobalContext();
     const { addSubscription, connection, unsubscribeById } = useServerNotificationsContext();
+    const { preparePythonSandbox } = usePythonSandbox();
     const [status, setStatus] = React.useState(api.RemoteTaskStatus.Unknown);
     const [log, setLog] = React.useState(null);
     const [error, setError] = React.useState(null);
@@ -5441,6 +5453,7 @@ const usePythonTask = () => {
             ],
         });
         prototypeId = prototypeId.replace(/["']+/g, "");
+        await preparePythonSandbox({ resourceId });
         const { id: newTaskId, success } = await api$1.remoteTaskManager.startTask1(prototypeId);
         if (!success) {
             setStatus(api.RemoteTaskStatus.Error);
@@ -5450,34 +5463,31 @@ const usePythonTask = () => {
         }
         const newSubscriptionId = await addSubscription({
             tag: "python_task_progress_event",
-            taskId: newTaskId,
+            resourceId,
         });
         setTaskId(newTaskId);
         setSubscriptionId(newSubscriptionId);
         const onNotification = async ({ data }) => {
             if (data?.taskId === newTaskId) {
+                const isFinished = [api.RemoteTaskStatus.Completed, api.RemoteTaskStatus.Error].includes(data.status);
                 setStatus(data.status);
                 setLog([logRef.current, data.log].filter(Boolean).join("\n"));
                 setExecutionTime(Date.now() - start);
                 setLoading(false);
-                setTaskId([api.RemoteTaskStatus.Completed, api.RemoteTaskStatus.Error].includes(data.status)
-                    ? null
-                    : newTaskId);
-                setSubscriptionId([api.RemoteTaskStatus.Completed, api.RemoteTaskStatus.Error].includes(data.status)
-                    ? null
-                    : newSubscriptionId);
-                if ([api.RemoteTaskStatus.Completed, api.RemoteTaskStatus.Error].includes(data.status)) {
+                setTaskId(isFinished ? null : newTaskId);
+                setSubscriptionId(isFinished ? null : newSubscriptionId);
+                if (isFinished) {
                     unsubscribeById(newSubscriptionId);
                     connection.off(SERVER_NOTIFICATION_EVENT.PythonProgressNotification, onNotification);
                 }
                 if (data.status === api.RemoteTaskStatus.Completed) {
                     const subTasks = await api$1.remoteTaskManager.get(newTaskId);
-                    setResult(subTasks?.[0]?.results ?? null);
+                    setResult(subTasks?.[0]?.results?.response ?? null);
                 }
             }
         };
         connection.on(SERVER_NOTIFICATION_EVENT.PythonProgressNotification, onNotification);
-    }, [reset, api$1.remoteTaskManager, addSubscription, connection, t, unsubscribeById]);
+    }, [reset, api$1, preparePythonSandbox, addSubscription, connection, t, unsubscribeById]);
     const stopTask = React.useCallback(async () => {
         await api$1.remoteTaskManager.stop(taskId);
         reset();
@@ -12587,6 +12597,7 @@ exports.useMapContext = useMapContext;
 exports.useMapDraw = useMapDraw;
 exports.useMapImages = useMapImages;
 exports.useProjectDashboardInit = useProjectDashboardInit;
+exports.usePythonSandbox = usePythonSandbox;
 exports.usePythonTask = usePythonTask;
 exports.useRedrawLayer = useRedrawLayer;
 exports.useRelatedDataSourceAttributes = useRelatedDataSourceAttributes;