@takeshape/schema 11.19.0 → 11.23.0

package/es/schemas/project-schema/experimental.json

@@ -136,7 +136,7 @@
           "type": "array",
           "items": {
             "default": {
-              "valueCheck": {
+              "condition": {
                 "type": "none"
               }
             },
@@ -153,9 +153,6 @@
         "propertyName": "type"
       },
       "oneOf": [
-        {
-          "$ref": "#/definitions/agentExecutionNoop"
-        },
         {
           "$ref": "#/definitions/agentExecutionInput"
         },
@@ -163,24 +160,13 @@
           "$ref": "#/definitions/agentExecutionGraphql"
         },
         {
-          "$ref": "#/definitions/agentExecutionGenerateText"
+          "$ref": "#/definitions/agentExecutionGenerate"
         },
         {
           "$ref": "#/definitions/agentExecutionChat"
         }
       ]
     },
-    "agentExecutionNoop": {
-      "title": "Agent Execution No Operation",
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": ["noop"]
-        }
-      },
-      "required": ["type"],
-      "additionalProperties": false
-    },
     "agentExecutionInputArgument": {
       "title": "Agent Execution Input Argument",
       "type": "object",
@@ -190,7 +176,7 @@
           "pattern": "^[0-9A-Za-z_]+$"
         },
         "argType": {
-          "enum": ["boolean", "integer", "number", "string"]
+          "enum": ["boolean", "integer", "number", "string", "sessionId"]
         },
         "required": {
           "type": "boolean"
@@ -408,12 +394,12 @@
       "required": ["ref"],
       "additionalProperties": false
     },
-    "agentExecutionGenerateText": {
-      "title": "Agent Execution Generate Text",
+    "agentExecutionGenerate": {
+      "title": "Agent Execution Generate",
       "type": "object",
       "properties": {
         "type": {
-          "enum": ["generateText"]
+          "enum": ["generate"]
         },
         "service": {
           "type": "string"
@@ -427,7 +413,7 @@
         "input": {
           "$ref": "#/definitions/agentAiStateInput"
         },
-        "jsonSchema": {
+        "outputShape": {
           "type": "string"
         },
         "tools": {
@@ -449,6 +435,38 @@
       "required": ["type", "service", "model", "input"],
       "additionalProperties": false
     },
+    "agentChatEndConditionNone": {
+      "title": "Agent Chat End Condition None",
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["none"]
+        }
+      },
+      "required": [
+        "type"
+      ],
+      "additionalProperties": false
+    },
+    "agentChatEndConditionStringContains": {
+      "title": "Agent Chat End Condition String Contains",
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": [
+            "stringContains"
+          ]
+        },
+        "string": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "type",
+        "string"
+      ],
+      "additionalProperties": false
+    },
     "agentExecutionChat": {
       "title": "Agent Execution Chat",
       "type": "object",
@@ -474,8 +492,19 @@
             "$ref": "#/definitions/agentToolConfig"
           }
         },
-        "sessionArg": {
-          "type": "string"
+        "endCondition": {
+          "title": "Agent Chat End Condition",
+          "discriminator": {
+            "propertyName": "type"
+          },
+          "oneOf": [
+            {
+              "$ref": "#/definitions/agentChatEndConditionNone"
+            },
+            {
+              "$ref": "#/definitions/agentChatEndConditionStringContains"
+            }
+          ]
         },
         "guardrails": {
           "type": "array",
@@ -487,25 +516,29 @@
           "$ref": "#/definitions/agentGenerateOptions"
         }
       },
-      "required": ["type", "service", "model", "input", "sessionArg"],
+      "required": ["type", "service", "model", "input", "endCondition"],
       "additionalProperties": false
     },
-    "agentValueCheckNone": {
-      "title": "Agent Value Check None",
+    "agentTransitionConditionNone": {
+      "title": "Agent Transition Condition None",
       "type": "object",
       "properties": {
         "type": {
           "enum": ["none"]
         }
       },
-      "required": ["type"]
+      "required": ["type"],
+      "additionalProperties": false
     },
-    "agentValueCheckBoolean": {
-      "title": "Agent Value Check Boolean",
+    "agentTransitionConditionStateOutput": {
+      "title": "Agent Transition Condition State Output",
       "type": "object",
       "properties": {
         "type": {
-          "enum": ["boolean"]
+          "enum": ["stateOutput"]
+        },
+        "stateId": {
+          "type": "string"
         },
         "path": {
           "type": "string"
@@ -514,22 +547,23 @@
           "type": "boolean"
         }
       },
-      "required": ["type", "path"]
+      "required": ["type", "stateId"],
+      "additionalProperties": false
     },
     "agentTransition": {
       "title": "Agent Transition",
       "type": "object",
       "properties": {
-        "valueCheck": {
+        "condition": {
           "discriminator": {
             "propertyName": "type"
           },
           "oneOf": [
             {
-              "$ref": "#/definitions/agentValueCheckNone"
+              "$ref": "#/definitions/agentTransitionConditionNone"
             },
             {
-              "$ref": "#/definitions/agentValueCheckBoolean"
+              "$ref": "#/definitions/agentTransitionConditionStateOutput"
             }
           ]
         },
@@ -542,7 +576,7 @@
         }
       },
       "additionalProperties": false,
-      "required": ["valueCheck", "destination"]
+      "required": ["condition", "destination"]
     },
     "agentMap": {
       "title": "Agent Map",

package/es/types/utils.js

@@ -57,7 +57,7 @@ export function isAIResolver(resolver) {
   return isBasicResolver(resolver) && isAIResolverName(resolver.name);
 }
 export function isAIAgentStateExecution(agentExecution) {
-  return agentExecution.type === 'generateText' || agentExecution.type === 'chat';
+  return agentExecution.type === 'generate' || agentExecution.type === 'chat';
 }
 export function isProjectSchemaWithServices(schema) {
   return !isUndefined(schema.services);

package/es/validate.js

@@ -795,7 +795,7 @@ function validateAgents(projectSchema) {
   }
   for (const [agentName, agent] of Object.entries(agents)) {
     for (const [stateId, state] of Object.entries(agent.states)) {
-      if (state.execution.type === 'generateText' || state.execution.type === 'chat') {
+      if (state.execution.type === 'generate' || state.execution.type === 'chat') {
         if (!state.execution.tools) {
           continue;
         }

package/examples/latest/agent-schema.json

@@ -101,6 +101,32 @@
           }
         }
       }
+    },
+    "AnswerResponse": {
+      "id": "AnswerResponse",
+      "name": "AnswerResponse",
+      "title": "AnswerResponse",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "answered": {
+            "description": "Set to true if you were able to answer the question",
+            "type": "boolean"
+          },
+          "message": {
+            "description": "Put your response here",
+            "type": "string"
+          },
+          "dogName": {
+            "description": "If the question is not answered, set the value of `dogName` to a similar dog name, eg change Franky to Frank.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "answered",
+          "message"
+        ]
+      }
     }
   },
   "workflows": {},
@@ -177,7 +203,7 @@
             },
             "transition": [
               {
-                "valueCheck": {
+                "condition": {
                   "type": "none"
                 },
                 "destination": "bbb"
@@ -209,7 +235,7 @@
             },
             "transition": [
               {
-                "valueCheck": {
+                "condition": {
                   "type": "none"
                 },
                 "destination": "ccc"
@@ -229,32 +255,33 @@
               }
             ],
             "execution": {
-              "type": "generateText",
+              "type": "generate",
               "service": "openai",
               "model": "gpt-4o",
               "input": {
                 "type": "template",
                 "inputTemplate": "Please respond with the color of this dog\n\n{{input}}\n\nif the answer is in this data:\n\n{{{json results}}}"
               },
-              "jsonSchema": "{\n  \"type\": \"object\",\n  \"properties\": {\n    \"answered\": {\n      \"description\": \"Set to true if you were able to answer the question\",\n      \"type\": \"boolean\"\n    },\n    \"message\": {\n      \"description\": \"Put your response here\",\n      \"type\": \"string\"\n    },\n    \"dogName\": {\n      \"description\": \"If the question is not answered, set the value of `dogName` to a similar dog name, eg change Franky to Frank.\",\n      \"type\": \"string\"\n    }\n  },\n  \"required\": [\"answered\", \"message\"]\n}"
+              "outputShape": "AnswerResponse"
             },
             "transition": [
               {
-                "valueCheck": {
-                  "type": "boolean",
+                "condition": {
+                  "type": "stateOutput",
+                  "stateId": "ccc",
                   "path": "answered"
                 },
                 "destination": "ddd"
               },
               {
-                "valueCheck": {
+                "condition": {
                   "type": "none"
                 },
                 "limit": 3,
                 "destination": "bbb"
               },
               {
-                "valueCheck": {
+                "condition": {
                   "type": "none"
                 },
                 "destination": "eee"
@@ -275,7 +302,7 @@
               }
             ],
             "execution": {
-              "type": "generateText",
+              "type": "generate",
               "service": "openai",
               "model": "gpt-4o",
               "input": {
@@ -299,7 +326,7 @@
               }
             ],
             "execution": {
-              "type": "generateText",
+              "type": "generate",
               "service": "openai",
               "model": "gpt-4o",
               "input": {
@@ -327,14 +354,14 @@
                 },
                 {
                   "argName": "sessionId",
-                  "argType": "string",
+                  "argType": "sessionId",
                   "required": false
                 }
               ]
             },
             "transition": [
               {
-                "valueCheck": {
+                "condition": {
                   "type": "none"
                 },
                 "destination": "3pjuyB47X"
@@ -351,7 +378,9 @@
                 "type": "arg",
                 "inputArgName": "input"
               },
-              "sessionArg": "sessionId",
+              "endCondition": {
+                "type": "none"
+              },
               "systemPrompt": "You are a helpful assistant."
             },
             "transition": []

package/examples/source/agent-schema.json

@@ -95,6 +95,29 @@
           }
         }
       }
+    },
+    "AnswerResponse": {
+      "id": "AnswerResponse",
+      "name": "AnswerResponse",
+      "title": "AnswerResponse",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "answered": {
+            "description": "Set to true if you were able to answer the question",
+            "type": "boolean"
+          },
+          "message": {
+            "description": "Put your response here",
+            "type": "string"
+          },
+          "dogName": {
+            "description": "If the question is not answered, set the value of `dogName` to a similar dog name, eg change Franky to Frank.",
+            "type": "string"
+          }
+        },
+        "required": ["answered", "message"]
+      }
     }
   },
   "workflows": {},
@@ -109,7 +132,7 @@
       }
     }
   },
-  "schemaVersion": "3.48.0",
+  "schemaVersion": "3.49.0",
   "apiVersion": "2",
   "services": {
     "openai": {
@@ -162,7 +185,7 @@
             },
             "transition": [
               {
-                "valueCheck": {
+                "condition": {
                   "type": "none"
                 },
                 "destination": "bbb"
@@ -189,7 +212,7 @@
               "path": "getDogList.items"
             },
             "transition": [
-              {"valueCheck": {"type": "none"}, "destination": "ccc"}
+              {"condition": {"type": "none"}, "destination": "ccc"}
             ]
           },
           "ccc": {
@@ -198,26 +221,26 @@
               {"name": "results", "steps": [{"type": "previousStateOutput"}]}
             ],
             "execution": {
-              "type": "generateText",
+              "type": "generate",
               "service": "openai",
               "model": "gpt-4o",
               "input": {
                 "type": "template",
                 "inputTemplate": "Please respond with the color of this dog\n\n{{input}}\n\nif the answer is in this data:\n\n{{{json results}}}"
               },
-              "jsonSchema": "{\n  \"type\": \"object\",\n  \"properties\": {\n    \"answered\": {\n      \"description\": \"Set to true if you were able to answer the question\",\n      \"type\": \"boolean\"\n    },\n    \"message\": {\n      \"description\": \"Put your response here\",\n      \"type\": \"string\"\n    },\n    \"dogName\": {\n      \"description\": \"If the question is not answered, set the value of `dogName` to a similar dog name, eg change Franky to Frank.\",\n      \"type\": \"string\"\n    }\n  },\n  \"required\": [\"answered\", \"message\"]\n}"
+              "outputShape": "AnswerResponse"
             },
             "transition": [
               {
-                "valueCheck": {"type": "boolean", "path": "answered"},
+                "condition": {"type": "stateOutput", "stateId": "ccc", "path": "answered"},
                 "destination": "ddd"
               },
               {
-                "valueCheck": {"type": "none"},
+                "condition": {"type": "none"},
                 "limit": 3,
                 "destination": "bbb"
               },
-              {"valueCheck": {"type": "none"}, "destination": "eee"}
+              {"condition": {"type": "none"}, "destination": "eee"}
             ]
           },
           "ddd": {
@@ -229,7 +252,7 @@
               }
             ],
             "execution": {
-              "type": "generateText",
+              "type": "generate",
               "service": "openai",
               "model": "gpt-4o",
               "input": {
@@ -248,7 +271,7 @@
               }
             ],
             "execution": {
-              "type": "generateText",
+              "type": "generate",
               "service": "openai",
               "model": "gpt-4o",
               "input": {
@@ -276,14 +299,14 @@
                 },
                 {
                   "argName": "sessionId",
-                  "argType": "string",
+                  "argType": "sessionId",
                   "required": false
                 }
               ]
             },
             "transition": [
               {
-                "valueCheck": {
+                "condition": {
                   "type": "none"
                 },
                 "destination": "3pjuyB47X"
@@ -300,7 +323,9 @@
                 "type": "arg",
                 "inputArgName": "input"
               },
-              "sessionArg": "sessionId",
+              "endCondition": {
+                "type": "none"
+              },
               "systemPrompt": "You are a helpful assistant."
             },
             "transition": []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "11.19.0",
+  "version": "11.23.0",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -28,9 +28,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/errors": "11.19.0",
-    "@takeshape/json-schema": "11.19.0",
-    "@takeshape/util": "11.19.0"
+    "@takeshape/json-schema": "11.23.0",
+    "@takeshape/util": "11.23.0",
+    "@takeshape/errors": "11.23.0"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",
@@ -46,7 +46,7 @@
     "meow": "^9.0.0",
     "p-map": "^5.0.0",
     "shortid": "^2.2.15",
-    "@takeshape/infra": "11.19.0"
+    "@takeshape/infra": "11.23.0"
   },
   "engines": {
     "node": ">=20"