@mastra/playground-ui 6.7.2 → 6.9.0-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # @mastra/playground-ui
 
+## 6.9.0-alpha.0
+
+### Minor Changes
+
+- Update peer dependencies to match core package version bump (0.23.4) ([#9487](https://github.com/mastra-ai/mastra/pull/9487))
+
+### Patch Changes
+
+- update peerdeps ([`5ca1cca`](https://github.com/mastra-ai/mastra/commit/5ca1ccac61ffa7141e6d9fa8f22d3ad4d03bf5dc))
+
+- Fixes issue where clicking the reset button in the model picker would fail to restore the original LanguageModelV2 (or any other types) object that was passed during agent construction. ([#9487](https://github.com/mastra-ai/mastra/pull/9487))
+
+- Remove unused /model-providers API ([#9554](https://github.com/mastra-ai/mastra/pull/9554))
+
+- Fix undefined runtimeContext using memory from playground ([#9548](https://github.com/mastra-ai/mastra/pull/9548))
+
+- Updated dependencies [[`5ca1cca`](https://github.com/mastra-ai/mastra/commit/5ca1ccac61ffa7141e6d9fa8f22d3ad4d03bf5dc), [`6d7e90d`](https://github.com/mastra-ai/mastra/commit/6d7e90db09713e6250f4d6c3d3cff1b4740e50f9), [`f78b908`](https://github.com/mastra-ai/mastra/commit/f78b9080e11af765969b36b4a619761056030840), [`23c2614`](https://github.com/mastra-ai/mastra/commit/23c26140fdbf04b8c59e8d7d52106d67dad962ec), [`139588d`](https://github.com/mastra-ai/mastra/commit/139588df7755c9111a3060f72a789c1a8c95e091), [`186b29b`](https://github.com/mastra-ai/mastra/commit/186b29bd51ac1dcc24ad3825fdb7207a6d6391a6), [`e365eda`](https://github.com/mastra-ai/mastra/commit/e365eda45795b43707310531cac1e2ce4e5a0712)]:
+  - @mastra/client-js@0.16.9-alpha.0
+  - @mastra/react@0.0.15-alpha.0
+  - @mastra/core@0.24.0-alpha.0
+
+## 6.8.0
+
+### Minor Changes
+
+- Toast error from workflow stream and resume stream ([#9460](https://github.com/mastra-ai/mastra/pull/9460))
+
+### Patch Changes
+
+- Updated dependencies [[`b55bbce`](https://github.com/mastra-ai/mastra/commit/b55bbce89404d35fdd967012dd503fae343d4c2d), [`d6cb18e`](https://github.com/mastra-ai/mastra/commit/d6cb18e189fd0ac95d4934cf0d6f2866876d1a2e), [`d0ecff7`](https://github.com/mastra-ai/mastra/commit/d0ecff793d5cd50408cd8d1d113f02e28d897a3d), [`e84a959`](https://github.com/mastra-ai/mastra/commit/e84a9592bfdec4f1c9fdf108c9d4ea4e2ee8f7e3), [`e742d37`](https://github.com/mastra-ai/mastra/commit/e742d371f24ef8059670cc05e9aee308eac068b9)]:
+  - @mastra/client-js@0.16.8
+  - @mastra/core@0.23.3
+  - @mastra/react@0.0.14
+
+## 6.8.0-alpha.0
+
+### Minor Changes
+
+- Toast error from workflow stream and resume stream ([#9460](https://github.com/mastra-ai/mastra/pull/9460))
+
+### Patch Changes
+
+- Updated dependencies [[`b55bbce`](https://github.com/mastra-ai/mastra/commit/b55bbce89404d35fdd967012dd503fae343d4c2d), [`d6cb18e`](https://github.com/mastra-ai/mastra/commit/d6cb18e189fd0ac95d4934cf0d6f2866876d1a2e), [`d0ecff7`](https://github.com/mastra-ai/mastra/commit/d0ecff793d5cd50408cd8d1d113f02e28d897a3d), [`e84a959`](https://github.com/mastra-ai/mastra/commit/e84a9592bfdec4f1c9fdf108c9d4ea4e2ee8f7e3), [`e742d37`](https://github.com/mastra-ai/mastra/commit/e742d371f24ef8059670cc05e9aee308eac068b9)]:
+  - @mastra/client-js@0.16.8-alpha.0
+  - @mastra/core@0.23.3-alpha.0
+  - @mastra/react@0.0.14-alpha.0
+
 ## 6.7.2
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -8133,6 +8133,110 @@ const useWorkflows = () => {
   });
 };
 
+const defaultOptions = {
+  duration: 3e3,
+  cancel: {
+    label: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.X, { size: "14" }),
+    onClick: () => {
+    }
+  },
+  unstyled: true,
+  classNames: {
+    toast: "bg-[#0F0F0F] w-full backdrop-accent h-auto rounded-lg gap-2 border border p-4 flex items-start rounded-lg pointer-events-auto",
+    title: "text-white font-semibold text-xs mb-1 -mt-1",
+    description: "!text-text text-sm !font-light",
+    cancelButton: "self-start !bg-transparent !p-0 flex items-center justify-center !text-text opacity-50 order-last hover:opacity-100",
+    actionButton: "!bg-white flex items-center justify-center font-medium !text-black order-last hover:opacity-80"
+  }
+};
+function getToastOptions(options) {
+  const { classNames, ...rest } = defaultOptions;
+  const { classNames: optionsClassNames, ...restOptions } = options || {};
+  return {
+    ...rest,
+    classNames: {
+      ...classNames,
+      title: cn(classNames?.title, "mt-auto", optionsClassNames?.title),
+      toast: cn(classNames?.toast, "!items-center", optionsClassNames?.toast),
+      cancelButton: cn(classNames?.cancelButton, "!self-center", optionsClassNames?.cancelButton),
+      actionButton: cn(classNames?.actionButton, optionsClassNames?.actionButton)
+    },
+    ...restOptions
+  };
+}
+const toast = (message, options = {}) => {
+  if (Array.isArray(message)) {
+    return message.forEach((msg) => sonner.toast(msg, getToastOptions(options)));
+  } else if (React.isValidElement(message)) {
+    return sonner.toast(message, getToastOptions(options));
+  } else if (typeof message === "string") {
+    return sonner.toast(message, getToastOptions(options));
+  }
+  throw new Error("Invalid message type");
+};
+toast.success = (message, options = {}) => {
+  switch (typeof message) {
+    case "string":
+      return sonner.toast.success(message, getToastOptions(options));
+    case "object":
+      return message.forEach((message2) => sonner.toast.success(message2, getToastOptions(options)));
+  }
+};
+toast.error = (message, options = {}) => {
+  switch (typeof message) {
+    case "string":
+      return sonner.toast.error(message, getToastOptions(options));
+    case "object":
+      return message.forEach((message2) => sonner.toast.error(message2, getToastOptions(options)));
+  }
+};
+toast.warning = (message, options = {}) => {
+  switch (typeof message) {
+    case "string":
+      return sonner.toast.warning(message, getToastOptions(options));
+    case "object":
+      return message.forEach((message2) => sonner.toast.warning(message2, getToastOptions(options)));
+  }
+};
+toast.info = (message, options = {}) => {
+  switch (typeof message) {
+    case "string":
+      return sonner.toast.info(message, getToastOptions(options));
+    case "object":
+      return message.forEach((message2) => sonner.toast.info(message2, getToastOptions(options)));
+  }
+};
+toast.custom = (message, options = {}) => {
+  return sonner.toast(message, getToastOptions(options));
+};
+toast.dismiss = (toastId) => {
+  if (toastId) {
+    sonner.toast.dismiss(toastId);
+  }
+};
+toast.promise = ({
+  myPromise,
+  loadingMessage,
+  successMessage,
+  errorMessage,
+  onSuccess,
+  onError,
+  options = {}
+}) => {
+  return sonner.toast.promise(myPromise, {
+    loading: loadingMessage ?? "Loading...",
+    success: (data) => {
+      onSuccess?.(data);
+      return successMessage;
+    },
+    error: (err) => {
+      onError?.(err);
+      return errorMessage || err?.message || "Error...";
+    },
+    ...getToastOptions(options)
+  });
+};
+
 const useExecuteWorkflow = () => {
   const client = react$3.useMastraClient();
   const createWorkflowRun = reactQuery.useMutation({
@@ -8229,6 +8333,23 @@ const useStreamWorkflow = () => {
       }
     };
   }, []);
+  const handleStreamError = (err, defaultMessage, setIsStreaming2) => {
+    if (err instanceof TypeError) {
+      return;
+    }
+    const errorMessage = err instanceof Error ? err.message : defaultMessage;
+    toast.error(errorMessage);
+    setIsStreaming2?.(false);
+  };
+  const handleWorkflowFinish = (value) => {
+    if (value.type === "workflow-finish") {
+      const streamStatus = value.payload?.workflowStatus;
+      const metadata = value.payload?.metadata;
+      if (streamStatus === "failed") {
+        throw new Error(metadata?.errorMessage || "Workflow execution failed");
+      }
+    }
+  };
   const streamWorkflow = reactQuery.useMutation({
     mutationFn: async ({
       workflowId,
@@ -8248,7 +8369,9 @@ const useStreamWorkflow = () => {
       });
       const workflow = client.getWorkflow(workflowId);
       const stream = await workflow.streamVNext({ runId, inputData, runtimeContext: runtimeContext$1, closeOnSuspend: true });
-      if (!stream) throw new Error("No stream returned");
+      if (!stream) {
+        return handleStreamError(new Error("No stream returned"), "No stream returned", setIsStreaming);
+      }
       const reader = stream.getReader();
       readerRef.current = reader;
       try {
@@ -8267,10 +8390,13 @@ const useStreamWorkflow = () => {
             if (value.type === "workflow-step-suspended") {
               setIsStreaming(false);
             }
+            if (value.type === "workflow-finish") {
+              handleWorkflowFinish(value);
+            }
           }
         }
-      } catch (error) {
-        console.error("Error streaming workflow:", error);
+      } catch (err) {
+        handleStreamError(err, "Error streaming workflow");
       } finally {
         if (isMountedRef.current) {
           setIsStreaming(false);
@@ -8300,7 +8426,9 @@ const useStreamWorkflow = () => {
       }
       const workflow = client.getWorkflow(workflowId);
       const stream = await workflow.observeStreamVNext({ runId });
-      if (!stream) throw new Error("No stream returned");
+      if (!stream) {
+        return handleStreamError(new Error("No stream returned"), "No stream returned", setIsStreaming);
+      }
       const reader = stream.getReader();
       observerRef.current = reader;
       try {
@@ -8319,10 +8447,13 @@ const useStreamWorkflow = () => {
             if (value.type === "workflow-step-suspended") {
               setIsStreaming(false);
             }
+            if (value.type === "workflow-finish") {
+              handleWorkflowFinish(value);
+            }
           }
         }
-      } catch (error) {
-        console.error("Error streaming workflow:", error);
+      } catch (err) {
+        handleStreamError(err, "Error observing workflow");
       } finally {
         if (isMountedRef.current) {
           setIsStreaming(false);
@@ -8353,7 +8484,9 @@ const useStreamWorkflow = () => {
         runtimeContext$1.set(key, value);
       });
       const stream = await workflow.resumeStreamVNext({ runId, step, resumeData, runtimeContext: runtimeContext$1 });
-      if (!stream) throw new Error("No stream returned");
+      if (!stream) {
+        return handleStreamError(new Error("No stream returned"), "No stream returned", setIsStreaming);
+      }
       const reader = stream.getReader();
       resumeStreamRef.current = reader;
       try {
@@ -8372,10 +8505,13 @@ const useStreamWorkflow = () => {
             if (value.type === "workflow-step-suspended") {
               setIsStreaming(false);
             }
+            if (value.type === "workflow-finish") {
+              handleWorkflowFinish(value);
+            }
           }
         }
-      } catch (error) {
-        console.error("Error resuming workflow stream:", error);
+      } catch (err) {
+        handleStreamError(err, "Error resuming workflow stream");
       } finally {
         if (isMountedRef.current) {
           setIsStreaming(false);
@@ -8609,9 +8745,10 @@ const useAgentMessages = ({
   memory
 }) => {
   const client = react$3.useMastraClient();
+  const { runtimeContext } = usePlaygroundStore();
   return reactQuery.useQuery({
-    queryKey: ["memory", "messages", threadId, agentId],
-    queryFn: () => client.getThreadMessages(threadId, { agentId }),
+    queryKey: ["memory", "messages", threadId, agentId, "runtimeContext"],
+    queryFn: () => client.getThreadMessages(threadId, { agentId, runtimeContext }),
     enabled: memory && Boolean(threadId),
     staleTime: 0,
     gcTime: 0,
@@ -10009,6 +10146,7 @@ function useAgentWorkingMemory(agentId, threadId, resourceId) {
   const [workingMemoryFormat, setWorkingMemoryFormat] = React.useState("markdown");
   const [isLoading, setIsLoading] = React.useState(true);
   const [isUpdating, setIsUpdating] = React.useState(false);
+  const { runtimeContext } = usePlaygroundStore();
   const refetch = React.useCallback(async () => {
     setIsLoading(true);
     try {
@@ -10017,7 +10155,7 @@ function useAgentWorkingMemory(agentId, threadId, resourceId) {
         setIsLoading(false);
         return;
       }
-      const res = await client.getWorkingMemory({ agentId, threadId, resourceId });
+      const res = await client.getWorkingMemory({ agentId, threadId, resourceId, runtimeContext });
       const { workingMemory, source, workingMemoryTemplate, threadExists: threadExists2 } = res;
       setThreadExists(threadExists2);
       setWorkingMemoryData(workingMemory);
@@ -10056,7 +10194,7 @@ function useAgentWorkingMemory(agentId, threadId, resourceId) {
           throw new Error("Invalid JSON working memory");
         }
       }
-      await client.updateWorkingMemory({ agentId, threadId, workingMemory: newMemory, resourceId });
+      await client.updateWorkingMemory({ agentId, threadId, workingMemory: newMemory, resourceId, runtimeContext });
       refetch();
     } catch (error) {
       console.error("Error updating working memory", error);
@@ -14003,6 +14141,7 @@ const AgentMetadataModelSwitcher = ({
   defaultProvider,
   defaultModel,
   updateModel,
+  resetModel,
   apiUrl = "/api/agents/providers"
 }) => {
   const [originalProvider] = React.useState(defaultProvider);
@@ -14020,6 +14159,10 @@ const AgentMetadataModelSwitcher = ({
   const [providersLoading, setProvidersLoading] = React.useState(true);
   const [highlightedProviderIndex, setHighlightedProviderIndex] = React.useState(-1);
   const [highlightedModelIndex, setHighlightedModelIndex] = React.useState(-1);
+  React.useEffect(() => {
+    setSelectedModel(defaultModel);
+    setSelectedProvider(defaultProvider || "");
+  }, [defaultModel, defaultProvider]);
   const modelInputRef = React.useRef(null);
   const providerInputRef = React.useRef(null);
   React.useEffect(() => {
@@ -14173,8 +14316,10 @@ const AgentMetadataModelSwitcher = ({
     ] });
   }
   const handleReset = async () => {
-    setSelectedProvider(cleanProviderId(originalProvider));
-    setSelectedModel(originalModel);
+    if (!resetModel) {
+      console.warn("Reset model function not provided");
+      return;
+    }
     setProviderSearch("");
     setModelSearch("");
     setIsSearchingProvider(false);
@@ -14183,10 +14328,7 @@ const AgentMetadataModelSwitcher = ({
     setShowModelSuggestions(false);
     try {
       setLoading(true);
-      await updateModel({
-        provider: originalProvider,
-        modelId: originalModel
-      });
+      await resetModel();
     } catch (error) {
       console.error("Failed to reset model:", error);
     } finally {
@@ -14594,7 +14736,6 @@ Switch.displayName = SwitchPrimitives__namespace.Root.displayName;
 
 const AgentMetadataModelList = ({
   modelList,
-  modelProviders,
   updateModelInModelList,
   reorderModelList
 }) => {
@@ -14632,7 +14773,6 @@ const AgentMetadataModelList = ({
       AgentMetadataModelListItem,
       {
         modelConfig,
-        modelProviders,
         updateModelInModelList: updateModel,
         showDragHandle: hasMultipleModels,
         dragHandleProps: provided2.dragHandleProps
@@ -14643,7 +14783,6 @@ const AgentMetadataModelList = ({
 };
 const AgentMetadataModelListItem = ({
   modelConfig,
-  modelProviders,
   updateModelInModelList,
   showDragHandle,
   dragHandleProps
@@ -14657,7 +14796,6 @@ const AgentMetadataModelListItem = ({
         defaultProvider: modelConfig.model.provider,
         defaultModel: modelConfig.model.modelId,
         updateModel: (params) => updateModelInModelList({ modelConfigId: modelConfig.id, model: params }),
-        modelProviders,
         autoSave: true
       }
     ) }),
@@ -14688,7 +14826,7 @@ const AgentMetadata = ({
   promptSlot,
   hasMemoryEnabled,
   updateModel,
-  modelProviders,
+  resetModel,
   updateModelInModelList,
   reorderModelList,
   modelVersion
@@ -14704,7 +14842,6 @@ const AgentMetadata = ({
       AgentMetadataModelList,
       {
         modelList: agent.modelList,
-        modelProviders,
         updateModelInModelList,
         reorderModelList
       }
@@ -14723,7 +14860,7 @@ const AgentMetadata = ({
             defaultProvider: agent.provider,
             defaultModel: agent.modelId,
             updateModel,
-            modelProviders
+            resetModel
           }
         )
       }
@@ -15053,13 +15190,6 @@ const useAgents = () => {
     queryFn: () => client.getAgents(runtimeContext)
   });
 };
-const useModelProviders = () => {
-  const client = react$3.useMastraClient();
-  return reactQuery.useQuery({
-    queryKey: ["model-providers"],
-    queryFn: () => client.getModelProviders()
-  });
-};
 const useUpdateAgentModel = (agentId) => {
   const client = react$3.useMastraClient();
   const queryClient = reactQuery.useQueryClient();
@@ -15099,6 +15229,19 @@ const useUpdateModelInModelList = (agentId) => {
     }
   });
 };
+const useResetAgentModel = (agentId) => {
+  const client = react$3.useMastraClient();
+  const queryClient = reactQuery.useQueryClient();
+  return reactQuery.useMutation({
+    mutationFn: async () => client.getAgent(agentId).resetModel(),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["agent", agentId] });
+    },
+    onError: (err) => {
+      console.error("Error resetting model", err);
+    }
+  });
+};
 
 const useAgent = (agentId) => {
   const client = react$3.useMastraClient();
@@ -15214,9 +15357,10 @@ const AgentToolPanel = ({ toolId, agentId }) => {
 
 const useMemory = (agentId) => {
   const client = react$3.useMastraClient();
+  const { runtimeContext } = usePlaygroundStore();
   return reactQuery.useQuery({
     queryKey: ["memory", agentId],
-    queryFn: () => agentId ? client.getMemoryStatus(agentId) : null,
+    queryFn: () => agentId ? client.getMemoryStatus(agentId, runtimeContext) : null,
     enabled: Boolean(agentId),
     staleTime: 5 * 60 * 1e3,
     // 5 minutes
@@ -15227,9 +15371,10 @@ const useMemory = (agentId) => {
 };
 const useMemoryConfig = (agentId) => {
   const client = react$3.useMastraClient();
+  const { runtimeContext } = usePlaygroundStore();
   return reactQuery.useQuery({
     queryKey: ["memory", "config", agentId],
-    queryFn: () => agentId ? client.getMemoryConfig({ agentId }) : null,
+    queryFn: () => agentId ? client.getMemoryConfig({ agentId, runtimeContext }) : null,
     enabled: Boolean(agentId),
     staleTime: 5 * 60 * 1e3,
     // 5 minutes
@@ -15245,9 +15390,10 @@ const useThreads = ({
   isMemoryEnabled
 }) => {
   const client = react$3.useMastraClient();
+  const { runtimeContext } = usePlaygroundStore();
   return reactQuery.useQuery({
     queryKey: ["memory", "threads", resourceId, agentId],
-    queryFn: () => isMemoryEnabled ? client.getMemoryThreads({ resourceId, agentId }) : null,
+    queryFn: () => isMemoryEnabled ? client.getMemoryThreads({ resourceId, agentId, runtimeContext }) : null,
     enabled: Boolean(isMemoryEnabled),
     staleTime: 0,
     gcTime: 0,
@@ -15258,8 +15404,9 @@ const useThreads = ({
 const useDeleteThread = () => {
   const client = react$3.useMastraClient();
   const queryClient = reactQuery.useQueryClient();
+  const { runtimeContext } = usePlaygroundStore();
   return reactQuery.useMutation({
-    mutationFn: ({ threadId, agentId, networkId }) => client.deleteThread(threadId, { agentId, networkId }),
+    mutationFn: ({ threadId, agentId, networkId }) => client.deleteThread(threadId, { agentId, networkId, runtimeContext }),
     onSuccess: (_, variables) => {
       const { agentId, networkId } = variables;
       if (agentId) {
@@ -15280,6 +15427,7 @@ const useMemorySearch = ({
   resourceId,
   threadId
 }) => {
+  const { runtimeContext } = usePlaygroundStore();
   const searchMemory = async (searchQuery, memoryConfig) => {
     if (!searchQuery.trim()) {
       return { results: [], count: 0, query: searchQuery };
@@ -15287,7 +15435,8 @@ const useMemorySearch = ({
     const params = new URLSearchParams({
       searchQuery,
       resourceId,
-      agentId
+      agentId,
+      runtimeContext: btoa(JSON.stringify(runtimeContext))
     });
     if (threadId) {
       params.append("threadId", threadId);
@@ -16647,8 +16796,8 @@ function AgentPromptEnhancer({ agentId }) {
 
 function AgentInformation({ agentId, threadId }) {
   const { data: agent, isLoading } = useAgent(agentId);
-  const { data: modelProviders } = useModelProviders();
   const { mutateAsync: updateModel } = useUpdateAgentModel(agentId);
+  const { mutateAsync: resetModel } = useResetAgentModel(agentId);
   const { mutate: reorderModelList } = useReorderModelList(agentId);
   const { mutateAsync: updateModelInModelList } = useUpdateModelInModelList(agentId);
   const { data: memory, isLoading: isMemoryLoading } = useMemory(agentId);
@@ -16693,9 +16842,9 @@ function AgentInformation({ agentId, threadId }) {
             agentId,
             agent,
             updateModel,
+            resetModel,
             updateModelInModelList,
             reorderModelList,
-            modelProviders: modelProviders || [],
             hasMemoryEnabled: Boolean(memory?.result),
             promptSlot: /* @__PURE__ */ jsxRuntime.jsx(AgentPromptEnhancer, { agentId }),
             modelVersion: agent.modelVersion
@@ -17275,7 +17424,6 @@ function TemplateForm({
             updateModel: onModelUpdate || (() => Promise.resolve({ message: "Updated" })),
             closeEditor: () => {
             },
-            modelProviders: ["openai", "anthropic", "google", "xai", "groq"],
             autoSave: true,
             selectProviderPlaceholder: "Provider"
           }
@@ -20339,6 +20487,10 @@ const useEvalsByAgentId = (agentId, type) => {
   });
 };
 
+Object.defineProperty(exports, "Toaster", {
+  enumerable: true,
+  get: () => sonner.Toaster
+});
 exports.AgentChat = AgentChat;
 exports.AgentCoinIcon = AgentCoinIcon;
 exports.AgentEntityHeader = AgentEntityHeader;
@@ -20547,6 +20699,7 @@ exports.parseError = parseError;
 exports.providerMapToIcon = providerMapToIcon;
 exports.scoresListColumns = scoresListColumns;
 exports.spanTypePrefixes = spanTypePrefixes;
+exports.toast = toast;
 exports.traceScoresListColumns = traceScoresListColumns;
 exports.tracesListColumns = tracesListColumns;
 exports.transformKey = transformKey;
@@ -20570,11 +20723,11 @@ exports.useMainSidebar = useMainSidebar;
 exports.useMemory = useMemory;
 exports.useMemoryConfig = useMemoryConfig;
 exports.useMemorySearch = useMemorySearch;
-exports.useModelProviders = useModelProviders;
 exports.useModelReset = useModelReset;
 exports.usePlaygroundStore = usePlaygroundStore;
 exports.usePolling = usePolling;
 exports.useReorderModelList = useReorderModelList;
+exports.useResetAgentModel = useResetAgentModel;
 exports.useScorer = useScorer;
 exports.useScorers = useScorers;
 exports.useScoresByEntityId = useScoresByEntityId;