Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions apps/hash-ai-worker-ts/src/activities/flow-activities.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { CreateFlowActivities } from "@local/hash-backend-utils/flows";
import type { VaultClient } from "@local/hash-backend-utils/vault";
import type { ActionDefinitionId } from "@local/hash-isomorphic-utils/flows/action-definitions";
import type { AiFlowActionDefinitionId } from "@local/hash-isomorphic-utils/flows/action-definitions";

import { answerQuestionAction } from "./flow-activities/answer-question-action.js";
import { generateFlowRunName } from "./flow-activities/generate-flow-run-name-activity.js";
Expand All @@ -11,19 +12,14 @@ import { inferEntitiesFromContentAction } from "./flow-activities/infer-entities
import { inferMetadataFromDocumentAction } from "./flow-activities/infer-metadata-from-document-action.js";
import { persistEntitiesAction } from "./flow-activities/persist-entities-action.js";
import { persistEntityAction } from "./flow-activities/persist-entity-action.js";
import { persistFlowActivity } from "./flow-activities/persist-flow-activity.js";
import { processAutomaticBrowsingSettingsAction } from "./flow-activities/process-automatic-browsing-settings-action.js";
import { researchEntitiesAction } from "./flow-activities/research-entities-action.js";
import type { FlowActionActivity } from "./flow-activities/types.js";
import { userHasPermissionToRunFlowInWebActivity } from "./flow-activities/user-has-permission-to-run-flow-in-web-activity.js";
import { webSearchAction } from "./flow-activities/web-search-action.js";
import { writeGoogleSheetAction } from "./flow-activities/write-google-sheet-action.js";

export const createFlowActionActivities = ({
vaultClient,
}: {
vaultClient: VaultClient;
}): Record<`${ActionDefinitionId}Action`, FlowActionActivity> => ({
export const createFlowActionActivities: CreateFlowActivities<
AiFlowActionDefinitionId
> = ({ vaultClient }: { vaultClient: VaultClient }) => ({
generateWebQueriesAction,
webSearchAction,
getWebPageByUrlAction,
Expand All @@ -50,6 +46,4 @@ export const createFlowActivities = ({
}) => ({
...createFlowActionActivities({ vaultClient }),
generateFlowRunName,
persistFlowActivity,
userHasPermissionToRunFlowInWebActivity,
});
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { extractEntityUuidFromEntityId } from "@blockprotocol/type-system";
import type { FlowActionActivity } from "@local/hash-backend-utils/flows";
import { getSimpleGraph } from "@local/hash-backend-utils/simplified-graph";
import { queryEntitySubgraph } from "@local/hash-graph-sdk/entity";
import { getSimplifiedActionInputs } from "@local/hash-isomorphic-utils/flows/action-definitions";
import { getSimplifiedAiFlowActionInputs } from "@local/hash-isomorphic-utils/flows/action-definitions";
import type {
FormattedText,
StepOutput,
Expand Down Expand Up @@ -32,7 +33,6 @@ import { mapActionInputEntitiesToEntities } from "../shared/map-action-input-ent
import { openAiSeed } from "../shared/open-ai-seed.js";
import type { PermittedOpenAiModel } from "../shared/openai-client.js";
import { stringify } from "../shared/stringify.js";
import type { FlowActionActivity } from "./types.js";

const answerTools: LlmToolDefinition[] = [
{
Expand Down Expand Up @@ -403,7 +403,7 @@ export const answerQuestionAction: FlowActionActivity = async ({ inputs }) => {
context,
entities: inputEntities,
question,
} = getSimplifiedActionInputs({
} = getSimplifiedAiFlowActionInputs({
inputs,
actionType: "answerQuestion",
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import type {
import type { GoalFlowTriggerInput } from "@local/hash-isomorphic-utils/flows/goal-flow-definitions";
import { goalFlowDefinitionIds } from "@local/hash-isomorphic-utils/flows/goal-flow-definitions";
import type {
FlowActionDefinitionId,
FlowDefinition,
FlowTrigger,
PayloadKind,
Expand All @@ -21,8 +22,8 @@ import { getLlmResponse } from "../shared/get-llm-response.js";
import { getTextContentFromLlmMessage } from "../shared/get-llm-response/llm-message.js";
import { graphApiClient } from "../shared/graph-api-client.js";

type PersistFlowActivityParams = {
flowDefinition: FlowDefinition;
type GenerateFlowRunNameActivityParams = {
flowDefinition: FlowDefinition<FlowActionDefinitionId>;
flowTrigger: FlowTrigger;
};

Expand Down Expand Up @@ -90,7 +91,7 @@ const outputKindsToIgnore: PayloadKind[] = [
];

export const generateFlowRunName = async (
params: PersistFlowActivityParams,
params: GenerateFlowRunNameActivityParams,
) => {
const { flowDefinition, flowTrigger } = params;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { FlowActionActivity } from "@local/hash-backend-utils/flows";
import { isInferenceModelName } from "@local/hash-isomorphic-utils/ai-inference-types";
import { getSimplifiedActionInputs } from "@local/hash-isomorphic-utils/flows/action-definitions";
import { getSimplifiedAiFlowActionInputs } from "@local/hash-isomorphic-utils/flows/action-definitions";
import { StatusCode } from "@local/status";
import dedent from "dedent";

Expand All @@ -9,7 +10,6 @@ import { getToolCallsFromLlmAssistantMessage } from "../shared/get-llm-response/
import type { LlmToolDefinition } from "../shared/get-llm-response/types.js";
import { graphApiClient } from "../shared/graph-api-client.js";
import { inferenceModelAliasToSpecificModel } from "../shared/inference-model-alias-to-llm-model.js";
import type { FlowActionActivity } from "./types.js";

const webQueriesSystemPrompt = dedent(`
You are a Web Search Assistant.
Expand Down Expand Up @@ -43,7 +43,7 @@ type ProposeQueryFunctionCallArguments = {
export const generateWebQueriesAction: FlowActionActivity = async ({
inputs,
}) => {
const { prompt, model } = getSimplifiedActionInputs({
const { prompt, model } = getSimplifiedAiFlowActionInputs({
inputs,
actionType: "generateWebQueries",
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import type { FlowActionActivity } from "@local/hash-backend-utils/flows";
import {
getSimplifiedActionInputs,
type OutputNameForAction,
getSimplifiedAiFlowActionInputs,
type OutputNameForAiFlowAction,
} from "@local/hash-isomorphic-utils/flows/action-definitions";
import { StatusCode } from "@local/status";
import { Context } from "@temporalio/activity";

import { logProgress } from "../shared/log-progress.js";
import { createFileEntityFromUrl } from "./shared/create-file-entity-from-url.js";
import type { FlowActionActivity } from "./types.js";

export const getFileFromUrlAction: FlowActionActivity = async ({ inputs }) => {
const {
description,
displayName,
url: originalUrl,
} = getSimplifiedActionInputs({
} = getSimplifiedAiFlowActionInputs({
inputs,
actionType: "getFileFromUrl",
});
Expand Down Expand Up @@ -58,7 +58,7 @@ export const getFileFromUrlAction: FlowActionActivity = async ({ inputs }) => {
outputs: [
{
outputName:
"fileEntity" satisfies OutputNameForAction<"getFileFromUrl">,
"fileEntity" satisfies OutputNameForAiFlowAction<"getFileFromUrl">,
payload: {
kind: "Entity",
value: fileEntity,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import type { Url } from "@blockprotocol/type-system";
import type { FlowActionActivity } from "@local/hash-backend-utils/flows";
import {
getSimplifiedActionInputs,
type OutputNameForAction,
getSimplifiedAiFlowActionInputs,
type OutputNameForAiFlowAction,
} from "@local/hash-isomorphic-utils/flows/action-definitions";
import { StatusCode } from "@local/status";

import { getWebPageActivity } from "../get-web-page-activity.js";
import type { FlowActionActivity } from "./types.js";

export const getWebPageByUrlAction: FlowActionActivity = async ({ inputs }) => {
const { url } = getSimplifiedActionInputs({
const { url } = getSimplifiedAiFlowActionInputs({
inputs,
actionType: "getWebPageByUrl",
});
Expand All @@ -35,7 +35,7 @@ export const getWebPageByUrlAction: FlowActionActivity = async ({ inputs }) => {
outputs: [
{
outputName:
"webPage" satisfies OutputNameForAction<"getWebPageByUrl">,
"webPage" satisfies OutputNameForAiFlowAction<"getWebPageByUrl">,
payload: {
kind: "WebPage",
value: webPage,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "../../shared/testing-utilities/mock-get-flow-context.js";

import type { InputNameForAction } from "@local/hash-isomorphic-utils/flows/action-definitions";
import type { InputNameForAiFlowAction } from "@local/hash-isomorphic-utils/flows/action-definitions";
import { actionDefinitions } from "@local/hash-isomorphic-utils/flows/action-definitions";
import type { StepInput } from "@local/hash-isomorphic-utils/flows/types";
import { expect, test } from "vitest";
Expand All @@ -15,7 +15,8 @@ test(
const status = await getWebPageSummaryAction({
inputs: [
{
inputName: "url" satisfies InputNameForAction<"getWebPageSummary">,
inputName:
"url" satisfies InputNameForAiFlowAction<"getWebPageSummary">,
payload: { kind: "Text", value: url },
},
...actionDefinitions.getWebPageSummary.inputs.flatMap<StepInput>(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import type { Url } from "@blockprotocol/type-system";
import type { FlowActionActivity } from "@local/hash-backend-utils/flows";
import { isInferenceModelName } from "@local/hash-isomorphic-utils/ai-inference-types";
import {
getSimplifiedActionInputs,
type OutputNameForAction,
getSimplifiedAiFlowActionInputs,
type OutputNameForAiFlowAction,
} from "@local/hash-isomorphic-utils/flows/action-definitions";
import { StatusCode } from "@local/status";
import dedent from "dedent";
Expand All @@ -13,7 +14,6 @@ import { getLlmResponse } from "../shared/get-llm-response.js";
import { getTextContentFromLlmMessage } from "../shared/get-llm-response/llm-message.js";
import { graphApiClient } from "../shared/graph-api-client.js";
import { inferenceModelAliasToSpecificModel } from "../shared/inference-model-alias-to-llm-model.js";
import type { FlowActionActivity } from "./types.js";

const generateSummarizeWebPageSystemPrompt = (params: {
numberOfSentences: number;
Expand All @@ -34,7 +34,7 @@ const generateSummarizeWebPageSystemPrompt = (params: {
export const getWebPageSummaryAction: FlowActionActivity = async ({
inputs,
}) => {
const { url, model, numberOfSentences } = getSimplifiedActionInputs({
const { url, model, numberOfSentences } = getSimplifiedAiFlowActionInputs({
inputs,
actionType: "getWebPageSummary",
});
Expand Down Expand Up @@ -124,15 +124,15 @@ export const getWebPageSummaryAction: FlowActionActivity = async ({
outputs: [
{
outputName:
"summary" satisfies OutputNameForAction<"getWebPageSummary">,
"summary" satisfies OutputNameForAiFlowAction<"getWebPageSummary">,
payload: {
kind: "Text",
value: summary,
},
},
{
outputName:
"title" satisfies OutputNameForAction<"getWebPageSummary">,
"title" satisfies OutputNameForAiFlowAction<"getWebPageSummary">,
payload: {
kind: "Text",
value: webPage.title,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ import {
entityIdFromComponents,
} from "@blockprotocol/type-system";
import { typedKeys } from "@local/advanced-types/typed-entries";
import type { FlowActionActivity } from "@local/hash-backend-utils/flows";
import { isInferenceModelName } from "@local/hash-isomorphic-utils/ai-inference-types";
import {
getSimplifiedActionInputs,
type OutputNameForAction,
getSimplifiedAiFlowActionInputs,
type OutputNameForAiFlowAction,
} from "@local/hash-isomorphic-utils/flows/action-definitions";
import type { ProposedEntity } from "@local/hash-isomorphic-utils/flows/types";
import { generateUuid } from "@local/hash-isomorphic-utils/generate-uuid";
Expand All @@ -31,7 +32,6 @@ import { getFlowContext } from "../shared/get-flow-context.js";
import { graphApiClient } from "../shared/graph-api-client.js";
import { inferenceModelAliasToSpecificModel } from "../shared/inference-model-alias-to-llm-model.js";
import { isPermittedOpenAiModel } from "../shared/openai-client.js";
import type { FlowActionActivity } from "./types.js";

export const inferEntitiesFromContentAction: FlowActionActivity = async ({
inputs,
Expand All @@ -41,7 +41,7 @@ export const inferEntitiesFromContentAction: FlowActionActivity = async ({
entityTypeIds,
model: modelAlias,
relevantEntitiesPrompt,
} = getSimplifiedActionInputs({
} = getSimplifiedAiFlowActionInputs({
inputs,
actionType: "inferEntitiesFromContent",
});
Expand Down Expand Up @@ -218,7 +218,7 @@ export const inferEntitiesFromContentAction: FlowActionActivity = async ({
outputs: [
{
outputName:
"proposedEntities" satisfies OutputNameForAction<"inferEntitiesFromContent">,
"proposedEntities" satisfies OutputNameForAiFlowAction<"inferEntitiesFromContent">,
payload: {
kind: "ProposedEntity",
value: proposedEntities,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import type {
Url,
} from "@blockprotocol/type-system";
import { extractEntityUuidFromEntityId } from "@blockprotocol/type-system";
import type { FlowActionActivity } from "@local/hash-backend-utils/flows";
import type { HashEntity } from "@local/hash-graph-sdk/entity";
import {
getSimplifiedActionInputs,
type OutputNameForAction,
getSimplifiedAiFlowActionInputs,
type OutputNameForAiFlowAction,
} from "@local/hash-isomorphic-utils/flows/action-definitions";
import type { PersistedEntity } from "@local/hash-isomorphic-utils/flows/types";
import {
Expand All @@ -32,7 +33,6 @@ import { useFileSystemPathFromEntity } from "../shared/use-file-system-file-from
import { generateDocumentPropertyPatches } from "./infer-metadata-from-document-action/generate-property-patches.js";
import { generateDocumentProposedEntitiesAndCreateClaims } from "./infer-metadata-from-document-action/generate-proposed-entities-and-claims.js";
import { getLlmAnalysisOfDoc } from "./infer-metadata-from-document-action/get-llm-analysis-of-doc.js";
import type { FlowActionActivity } from "./types.js";

const isFileEntity = (entity: HashEntity): entity is HashEntity<File> =>
systemPropertyTypes.fileStorageKey.propertyTypeBaseUrl in entity.properties &&
Expand All @@ -48,7 +48,7 @@ export const inferMetadataFromDocumentAction: FlowActionActivity = async ({
webId,
} = await getFlowContext();

const { documentEntityId } = getSimplifiedActionInputs({
const { documentEntityId } = getSimplifiedAiFlowActionInputs({
inputs,
actionType: "inferMetadataFromDocument",
});
Expand Down Expand Up @@ -247,15 +247,15 @@ export const inferMetadataFromDocumentAction: FlowActionActivity = async ({
outputs: [
{
outputName:
"proposedEntities" satisfies OutputNameForAction<"inferMetadataFromDocument">,
"proposedEntities" satisfies OutputNameForAiFlowAction<"inferMetadataFromDocument">,
payload: {
kind: "ProposedEntity",
value: proposedEntities,
},
},
{
outputName:
"updatedDocumentEntity" satisfies OutputNameForAction<"inferMetadataFromDocument">,
"updatedDocumentEntity" satisfies OutputNameForAiFlowAction<"inferMetadataFromDocument">,
payload: {
kind: "PersistedEntity",
value: persistedDocumentEntity,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import type { EntityId } from "@blockprotocol/type-system";
import type { FlowActionActivity } from "@local/hash-backend-utils/flows";
import {
flattenPropertyMetadata,
HashEntity,
} from "@local/hash-graph-sdk/entity";
import { getSimplifiedActionInputs } from "@local/hash-isomorphic-utils/flows/action-definitions";
import { getSimplifiedAiFlowActionInputs } from "@local/hash-isomorphic-utils/flows/action-definitions";
import type {
FailedEntityProposal,
PersistedEntities,
Expand All @@ -16,10 +17,9 @@ import {
fileEntityTypeIds,
persistEntityAction,
} from "./persist-entity-action.js";
import type { FlowActionActivity } from "./types.js";

export const persistEntitiesAction: FlowActionActivity = async ({ inputs }) => {
const { draft, proposedEntities } = getSimplifiedActionInputs({
const { draft, proposedEntities } = getSimplifiedAiFlowActionInputs({
inputs,
actionType: "persistEntities",
});
Expand Down
Loading
Loading