H-2206, H-2242: Support entities with multiple types in frontend (#5312)

hashintel · Nov 1, 2024 · 8cb1cb2 · 8cb1cb2
1 parent 9f8fc71
commit 8cb1cb2
Show file tree

Hide file tree

Showing 253 changed files with 3,550 additions and 2,212 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -109,6 +109,7 @@ blocks/**/.env
 **/dist
 **/build
 **/target
+**/pkg
 
 # vscode config
 **/.vscode/settings.json

diff --git a/apps/hash-ai-worker-ts/src/activities/flow-activities/infer-entities-from-content-action.ts b/apps/hash-ai-worker-ts/src/activities/flow-activities/infer-entities-from-content-action.ts
@@ -172,7 +172,7 @@ export const inferEntitiesFromContentAction: FlowActionActivity = async ({
 
       return {
         localEntityId: localIdToEntityId[proposal.entityId]!,
-        entityTypeId: entityTypeId as VersionedUrl,
+        entityTypeIds: [entityTypeId as VersionedUrl],
         claims: {
           isObjectOf: [],
           isSubjectOf: [],

diff --git a/apps/hash-ai-worker-ts/src/activities/flow-activities/persist-entities-action.ts b/apps/hash-ai-worker-ts/src/activities/flow-activities/persist-entities-action.ts
@@ -28,8 +28,12 @@ export const persistEntitiesAction: FlowActionActivity = async ({ inputs }) => {
    */
   const entitiesWithDependenciesSortedLast = proposedEntities.toSorted(
     (a, b) => {
-      const isAFileEntity = fileEntityTypeIds.includes(a.entityTypeId);
-      const isBFileEntity = fileEntityTypeIds.includes(b.entityTypeId);
+      const isAFileEntity = a.entityTypeIds.some((entityTypeId) =>
+        fileEntityTypeIds.includes(entityTypeId),
+      );
+      const isBFileEntity = b.entityTypeIds.some((entityTypeId) =>
+        fileEntityTypeIds.includes(entityTypeId),
+      );
       if (isAFileEntity && !isBFileEntity) {
         return -1;
       } else if (isBFileEntity && !isAFileEntity) {
@@ -75,7 +79,7 @@ export const persistEntitiesAction: FlowActionActivity = async ({ inputs }) => {
   for (const unresolvedEntity of entitiesWithDependenciesSortedLast) {
     const {
       claims,
-      entityTypeId,
+      entityTypeIds,
       localEntityId,
       properties,
       provenance,
@@ -86,7 +90,7 @@ export const persistEntitiesAction: FlowActionActivity = async ({ inputs }) => {
 
     const entityWithResolvedLinks: ProposedEntityWithResolvedLinks = {
       claims,
-      entityTypeId,
+      entityTypeIds,
       localEntityId,
       properties,
       propertyMetadata,

diff --git a/apps/hash-ai-worker-ts/src/activities/flow-activities/persist-entity-action.ts b/apps/hash-ai-worker-ts/src/activities/flow-activities/persist-entity-action.ts
@@ -67,7 +67,7 @@ export const persistEntityAction: FlowActionActivity = async ({ inputs }) => {
   const createEditionAsDraft = draft ?? false;
 
   const {
-    entityTypeId,
+    entityTypeIds,
     localEntityId,
     claims,
     properties,
@@ -80,7 +80,7 @@ export const persistEntityAction: FlowActionActivity = async ({ inputs }) => {
     CreateEntityParameters,
     "relationships" | "ownedById" | "draft" | "linkData"
   > & { linkData: Entity["linkData"] } = {
-    entityTypeId,
+    entityTypeIds,
     properties: mergePropertyObjectAndMetadata(properties, propertyMetadata),
     linkData,
     provenance,
@@ -114,7 +114,9 @@ export const persistEntityAction: FlowActionActivity = async ({ inputs }) => {
    * by looking up the entity type's parents in the graph, rather than
    * relying on a hardcoded value.
    */
-  const isFileEntity = fileEntityTypeIds.includes(entityTypeId);
+  const isFileEntity = entityTypeIds.some((entityTypeId) =>
+    fileEntityTypeIds.includes(entityTypeId),
+  );
 
   const fileUrl = isFileEntity
     ? (properties as Partial<FileProperties>)[
@@ -134,7 +136,7 @@ export const persistEntityAction: FlowActionActivity = async ({ inputs }) => {
       url: fileUrl,
       propertyMetadata,
       provenance,
-      entityTypeId,
+      entityTypeIds,
     });
 
     if (getFileEntityFromUrlStatus.status !== "ok") {
@@ -305,12 +307,15 @@ export const persistEntityAction: FlowActionActivity = async ({ inputs }) => {
       includeDrafts: draft,
     });
 
+    const entityTypeId =
+      `https://hash.ai/@hash/types/entity-type/${linkType}/v/1` as const;
+
     return LinkEntity.create<T extends "has-subject" ? HasSubject : HasObject>(
       graphApiClient,
       { actorId: webBotActorId },
       {
         draft,
-        entityTypeId: `https://hash.ai/@hash/types/entity-type/${linkType}/v/1`,
+        entityTypeIds: [entityTypeId],
         ownedById: webId,
         provenance: {
           ...claim.metadata.provenance,

diff --git a/apps/hash-ai-worker-ts/src/activities/flow-activities/persist-flow-activity.ts b/apps/hash-ai-worker-ts/src/activities/flow-activities/persist-flow-activity.ts
@@ -60,7 +60,7 @@ export const persistFlowActivity = async (
     await Entity.create<FlowRun>(graphApiClient, userAuthentication, {
       ownedById: webId,
       entityUuid: flowRunId,
-      entityTypeId: systemEntityTypes.flowRun.entityTypeId,
+      entityTypeIds: [systemEntityTypes.flowRun.entityTypeId],
       properties: flowRunProperties,
       provenance,
       draft: false,

diff --git a/...i-worker-ts/src/activities/flow-activities/research-entities-action/coordinating-agent.ts b/...i-worker-ts/src/activities/flow-activities/research-entities-action/coordinating-agent.ts
@@ -95,7 +95,8 @@ const parseAndResolveCoordinatorInputs = async (params: {
     graphApiClient,
     entityTypeIds: [
       ...entityTypeIds!,
-      ...(existingEntities?.map(({ metadata }) => metadata.entityTypeId) ?? []),
+      ...(existingEntities?.flatMap(({ metadata }) => metadata.entityTypeIds) ??
+        []),
     ].filter((entityTypeId, index, all) => all.indexOf(entityTypeId) === index),
     actorId: userAuthentication.actorId,
   });
@@ -502,7 +503,7 @@ export const runCoordinatingAgent: FlowActionActivity<{
        */
       propertyMetadata: { value: {} },
       provenance: fileEditionProvenance,
-      entityTypeId,
+      entityTypeIds: [entityTypeId],
       localEntityId: entityIdFromComponents(
         webId,
         generateUuid() as EntityUuid,

diff --git a/...tivities/flow-activities/research-entities-action/coordinating-agent/generate-messages.ts b/...tivities/flow-activities/research-entities-action/coordinating-agent/generate-messages.ts
@@ -54,8 +54,9 @@ export const generateProgressReport = (params: {
         .map((proposedEntity) =>
           simplifyProposedEntityForLlmConsumption({
             proposedEntity,
-            entityType:
-              allDereferencedEntityTypesById[proposedEntity.entityTypeId]!,
+            entityTypes: proposedEntity.entityTypeIds.map(
+              (entityTypeId) => allDereferencedEntityTypesById[entityTypeId]!,
+            ),
           }),
         )
         .join("\n")}
@@ -69,8 +70,9 @@ export const generateProgressReport = (params: {
         .map((proposedLink) =>
           simplifyProposedEntityForLlmConsumption({
             proposedEntity: proposedLink,
-            entityType:
-              allDereferencedEntityTypesById[proposedLink.entityTypeId]!,
+            entityTypes: proposedLink.entityTypeIds.map(
+              (entityTypeId) => allDereferencedEntityTypesById[entityTypeId]!,
+            ),
           }),
         )
         .join("\n")}

diff --git a/...flow-activities/research-entities-action/coordinating-agent/process-complete-tool-call.ts b/...flow-activities/research-entities-action/coordinating-agent/process-complete-tool-call.ts
@@ -86,7 +86,9 @@ export const processCompleteToolCall = ({
 
   const missingEntityTypes = input.entityTypes.filter(
     ({ $id }) =>
-      !submittedEntities.some(({ entityTypeId }) => entityTypeId === $id),
+      !submittedEntities.some(({ entityTypeIds }) =>
+        entityTypeIds.includes($id),
+      ),
   );
 
   if (missingEntityTypes.length > 0) {
@@ -99,7 +101,9 @@ export const processCompleteToolCall = ({
 
   const missingLinkEntityTypes = input.linkEntityTypes?.filter(
     ({ $id }) =>
-      !submittedEntities.some(({ entityTypeId }) => entityTypeId === $id),
+      !submittedEntities.some(({ entityTypeIds }) =>
+        entityTypeIds.includes($id),
+      ),
   );
 
   if (missingLinkEntityTypes && missingLinkEntityTypes.length > 0) {

diff --git a/...low-activities/research-entities-action/coordinating-agent/summarize-existing-entities.ts b/...low-activities/research-entities-action/coordinating-agent/summarize-existing-entities.ts
@@ -12,7 +12,7 @@ import { simplifyEntity } from "../../../shared/simplify-entity.js";
 
 export type ExistingEntitySummary = {
   entityId: EntityId;
-  entityTypeId: VersionedUrl;
+  entityTypeIds: [VersionedUrl, ...VersionedUrl[]];
   name: string;
   summary: string;
 };
@@ -142,7 +142,7 @@ export const summarizeExistingEntities = async (params: {
 
       validEntitySummaries.push({
         entityId: existingEntity.metadata.recordId.entityId,
-        entityTypeId: existingEntity.metadata.entityTypeId,
+        entityTypeIds: existingEntity.metadata.entityTypeIds,
         name,
         summary,
       });

diff --git a/...ivities/research-entities-action/link-follower-agent/get-link-follower-next-tool-calls.ts b/...ivities/research-entities-action/link-follower-agent/get-link-follower-next-tool-calls.ts
@@ -83,15 +83,15 @@ const generateUserMessage = (
 <Entities>
 Here is the information about entities you have already gathered:
 ${JSON.stringify(
-  entitySummaries.map(({ localId, name, summary, entityTypeId }) => {
+  entitySummaries.map(({ localId, name, summary, entityTypeIds }) => {
     const claimsAboutEntity = claimsGathered.filter(
       (claim) => claim.subjectEntityLocalId === localId,
     );
 
     return {
       name,
       summary,
-      entityType: entityTypeId,
+      entityTypes: entityTypeIds,
       claims: JSON.stringify(
         claimsAboutEntity.map(simplifyClaimForLlmConsumption),
       ),