@takeshape/schema 11.33.2 → 11.36.0

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

@@ -10,13 +10,70 @@
         "description": {
           "type": "string"
         },
+        "systemPrompt": {
+          "type": "string"
+        },
+        "api": {
+          "$ref": "#/definitions/agentApi"
+        },
+        "start": {
+          "$ref": "#/definitions/agentStart"
+        },
         "states": {
           "$ref": "#/definitions/agentStateMap"
         }
       },
-      "required": ["states"],
+      "required": ["start", "states", "api"],
       "additionalProperties": false
     },
+    "agentApi": {
+      "title": "Agent API",
+      "discriminator": {
+        "propertyName": "type"
+      },
+      "oneOf": [
+        {
+          "$ref": "#/definitions/agentApiChat"
+        },
+        {
+          "$ref": "#/definitions/agentApiGenerate"
+        }
+      ]
+    },
+    "agentApiChat": {
+      "title": "Agent API Chat",
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["chat"]
+        },
+        "arguments": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/agentApiArgument"
+          }
+        }
+      },
+      "required": ["type"],
+      "additionalProperties": false
+    }, 
+    "agentApiGenerate": {
+      "title": "Agent API Generate",
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["generate"]
+        },
+        "arguments": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/agentApiArgument"
+          }
+        }
+      },
+      "required": ["type"],
+      "additionalProperties": false
+    },  
     "agentVariable": {
       "title": "Agent Variable",
       "type": "object",
@@ -164,6 +221,18 @@
       "required": ["type", "stateId"],
       "additionalProperties": false
     },
+    "agentStart": {
+      "title": "Agent Start",
+      "description": "Configuration for the start of an agent's execution",
+      "type": "object",
+      "properties": {
+        "transition": {
+          "$ref": "#/definitions/agentTransition"
+        }
+      },
+      "required": ["transition"],
+      "additionalProperties": false
+    },
     "agentStateMap": {
       "title": "Agent States",
       "description": "States that are traversed during the execution of an agent.",
@@ -175,6 +244,19 @@
       },
       "additionalProperties": false
     },
+    "agentTransition": {
+      "title": "Agent State Transition",
+      "description": "These steps are evaluated in order until a destination is found.",
+      "type": "array",
+      "items": {
+        "default": {
+          "condition": {
+            "type": "none"
+          }
+        },
+        "$ref": "#/definitions/agentTransitionStep"
+      }
+    },
     "agentState": {
       "title": "Agent State",
       "description": "One step of an agent's execution.",
@@ -194,17 +276,7 @@
           "$ref": "#/definitions/agentExecution"
         },
         "transition": {
-          "title": "Agent State Transition",
-          "description": "These are evaluated in order until a destination is found.",
-          "type": "array",
-          "items": {
-            "default": {
-              "condition": {
-                "type": "none"
-              }
-            },
-            "$ref": "#/definitions/agentTransition"
-          }
+          "$ref": "#/definitions/agentTransition"
         }
       },
       "required": ["name", "execution"],
@@ -216,9 +288,6 @@
         "propertyName": "type"
       },
       "oneOf": [
-        {
-          "$ref": "#/definitions/agentExecutionInput"
-        },
         {
           "$ref": "#/definitions/agentExecutionGraphql"
         },
@@ -230,8 +299,8 @@
         }
       ]
     },
-    "agentExecutionInputArgument": {
-      "title": "Agent Execution Input Argument",
+    "agentApiArgument": {
+      "title": "Agent API Argument",
       "type": "object",
       "properties": {
         "argName": {
@@ -248,30 +317,6 @@
       "required": ["argName", "argType"],
       "additionalProperties": false
     },
-    "agentExecutionInput": {
-      "title": "Agent Execution Input",
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": ["input"]
-        },
-        "name": {
-          "type": "string",
-          "pattern": "^[0-9A-Za-z_]+$"
-        },
-        "inputType": {
-          "enum": ["query", "mutation"]
-        },
-        "arguments": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/agentExecutionInputArgument"
-          }
-        }
-      },
-      "required": ["type", "name", "inputType"],
-      "additionalProperties": false
-    },
     "agentExecutionGraphql": {
       "title": "Agent Execution GraphQL",
       "type": "object",
@@ -295,12 +340,10 @@
       "properties": {
         "type": {
           "enum": ["arg"]
-        },
-        "inputArgName": {
-          "type": "string"
         }
       },
-      "required": ["type", "inputArgName"]
+      "required": ["type"],
+      "additionalProperties": false
     },
     "agentAiStateInputTemplate": {
       "title": "Agent AI State Input Template",
@@ -313,7 +356,8 @@
           "type": "string"
         }
       },
-      "required": ["type", "inputTemplate"]
+      "required": ["type", "inputTemplate"],
+      "additionalProperties": false
     },
     "agentAiStateInput": {
       "title": "Agent AI State Input",
@@ -536,8 +580,8 @@
       "required": ["type", "service", "model", "input"],
       "additionalProperties": false
     },
-    "agentTransitionConditionNone": {
-      "title": "Agent Transition Condition None",
+    "agentTransitionStepConditionNone": {
+      "title": "Agent Transition Step Condition None",
       "type": "object",
       "properties": {
         "type": {
@@ -547,8 +591,8 @@
       "required": ["type"],
       "additionalProperties": false
     },
-    "agentTransitionConditionStateOutput": {
-      "title": "Agent Transition Condition State Output",
+    "agentTransitionStepConditionStateOutput": {
+      "title": "Agent Transition Step Condition State Output",
       "type": "object",
       "properties": {
         "type": {
@@ -567,8 +611,8 @@
       "required": ["type", "stateId"],
       "additionalProperties": false
     },
-    "agentTransitionConditionStringContains": {
-      "title": "Agent Transition Condition String Contains",
+    "agentTransitionStepConditionStringContains": {
+      "title": "Agent Transition Step Condition String Contains",
       "type": "object",
       "properties": {
         "type": {
@@ -587,8 +631,8 @@
       "required": ["type", "string"],
       "additionalProperties": false
     },
-    "agentTransitionConditionVariableExists": {
-      "title": "Agent Transition Condition Variable Exists",
+    "agentTransitionStepConditionVariableExists": {
+      "title": "Agent Transition Step Condition Variable Exists",
       "type": "object",
       "properties": {
         "type": {
@@ -604,8 +648,8 @@
       "required": ["type", "variable"],
       "additionalProperties": false
     },
-    "agentTransition": {
-      "title": "Agent Transition",
+    "agentTransitionStep": {
+      "title": "Agent Transition Step",
       "type": "object",
       "properties": {
         "destination": {
@@ -621,16 +665,16 @@
           },
           "oneOf": [
             {
-              "$ref": "#/definitions/agentTransitionConditionNone"
+              "$ref": "#/definitions/agentTransitionStepConditionNone"
             },
             {
-              "$ref": "#/definitions/agentTransitionConditionStateOutput"
+              "$ref": "#/definitions/agentTransitionStepConditionStateOutput"
             },
             {
-              "$ref": "#/definitions/agentTransitionConditionStringContains"
+              "$ref": "#/definitions/agentTransitionStepConditionStringContains"
             },
             {
-              "$ref": "#/definitions/agentTransitionConditionVariableExists"
+              "$ref": "#/definitions/agentTransitionStepConditionVariableExists"
             }
           ]
         },
@@ -681,16 +725,11 @@
         "agentName": {
           "type": "string",
           "pattern": "^[0-9A-Za-z_]+$"
-        },
-        "inputStateId": {
-          "type": "string",
-          "pattern": "^[0-9A-Za-z_]+$"
         }
       },
       "required": [
         "name",
-        "agentName",
-        "inputStateId"
+        "agentName"
       ],
       "additionalProperties": false
     },

package/es/taxonomies.js

@@ -1,10 +1,5 @@
-import memoize from 'lodash/memoize';
+import { weakMemoize } from '@takeshape/util';
 import { createSchemaPropertyAccessor } from './schema-util';
-function weakMemoize(fn) {
-  const memoized = memoize(fn);
-  memoized.cache = new WeakMap();
-  return memoized;
-}
 export function getFirstStringFieldV3(shape, projectSchema) {
   const forms = projectSchema.forms?.[shape.name];
   if (!forms?.default) {

package/examples/latest/agent-schema.json

@@ -186,30 +186,27 @@
     "agents": {
       "findDogColor": {
         "description": "AI Agent finds a dog's color based on its name",
+        "api": {
+          "type": "generate",
+          "arguments": [
+            {
+              "argName": "input",
+              "argType": "string",
+              "required": true
+            }
+          ]
+        },
+        "start": {
+          "transition": [
+            {
+              "condition": {
+                "type": "none"
+              },
+              "destination": "bbb"
+            }
+          ]
+        },
         "states": {
-          "aaa": {
-            "name": "mutation",
-            "execution": {
-              "type": "input",
-              "name": "findDogColor",
-              "inputType": "mutation",
-              "arguments": [
-                {
-                  "argName": "input",
-                  "argType": "string",
-                  "required": true
-                }
-              ]
-            },
-            "transition": [
-              {
-                "condition": {
-                  "type": "none"
-                },
-                "destination": "bbb"
-              }
-            ]
-          },
           "bbb": {
             "name": "query",
             "variables": [
@@ -339,35 +336,21 @@
         }
       },
       "chat": {
+        "api": {
+          "type": "chat",
+          "arguments": []
+        },
+        "start": {
+          "transition": [
+            {
+              "condition": {
+                "type": "none"
+              },
+              "destination": "3pjuyB47X"
+            }
+          ]
+        },
         "states": {
-          "_L2N2Yxut": {
-            "name": "mutation",
-            "execution": {
-              "type": "input",
-              "name": "chat",
-              "inputType": "mutation",
-              "arguments": [
-                {
-                  "argName": "input",
-                  "argType": "string",
-                  "required": true
-                },
-                {
-                  "argName": "sessionId",
-                  "argType": "sessionId",
-                  "required": false
-                }
-              ]
-            },
-            "transition": [
-              {
-                "condition": {
-                  "type": "none"
-                },
-                "destination": "3pjuyB47X"
-              }
-            ]
-          },
           "3pjuyB47X": {
             "name": "chat",
             "execution": {
@@ -375,8 +358,7 @@
               "service": "openai",
               "model": "gpt-4o",
               "input": {
-                "type": "arg",
-                "inputArgName": "input"
+                "type": "arg"
               },
               "systemPrompt": "You are a helpful assistant. If the user says they have no further questions, end your response with the string ALL_DONE."
             },

package/examples/source/agent-schema.json

@@ -168,30 +168,27 @@
     "agents": {
       "findDogColor": {
         "description": "AI Agent finds a dog's color based on its name",
+        "api": {
+          "type": "generate",
+          "arguments": [
+            {
+              "argName": "input",
+              "argType": "string",
+              "required": true
+            }
+          ]
+        },
+        "start": {
+          "transition": [
+            {
+              "condition": {
+                "type": "none"
+              },
+              "destination": "bbb"
+            }
+          ]
+        },
         "states": {
-          "aaa": {
-            "name": "mutation",
-            "execution": {
-              "type": "input",
-              "name": "findDogColor",
-              "inputType": "mutation",
-              "arguments": [
-                {
-                  "argName": "input",
-                  "argType": "string",
-                  "required": true
-                }
-              ]
-            },
-            "transition": [
-              {
-                "condition": {
-                  "type": "none"
-                },
-                "destination": "bbb"
-              }
-            ]
-          },
           "bbb": {
             "name": "query",
             "variables": [
@@ -284,35 +281,21 @@
         }
       },
       "chat": {
+        "api": {
+          "type": "chat",
+          "arguments": []
+        },
+        "start": {
+          "transition": [
+            {
+              "condition": {
+                "type": "none"
+              },
+              "destination": "3pjuyB47X"
+            }
+          ]
+        },
         "states": {
-          "_L2N2Yxut": {
-            "name": "mutation",
-            "execution": {
-              "type": "input",
-              "name": "chat",
-              "inputType": "mutation",
-              "arguments": [
-                {
-                  "argName": "input",
-                  "argType": "string",
-                  "required": true
-                },
-                {
-                  "argName": "sessionId",
-                  "argType": "sessionId",
-                  "required": false
-                }
-              ]
-            },
-            "transition": [
-              {
-                "condition": {
-                  "type": "none"
-                },
-                "destination": "3pjuyB47X"
-              }
-            ]
-          },
           "3pjuyB47X": {
             "name": "chat",
             "execution": {
@@ -320,8 +303,7 @@
               "service": "openai",
               "model": "gpt-4o",
               "input": {
-                "type": "arg",
-                "inputArgName": "input"
+                "type": "arg"
               },
               "systemPrompt": "You are a helpful assistant. If the user says they have no further questions, end your response with the string ALL_DONE."
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "11.33.2",
+  "version": "11.36.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.33.2",
-    "@takeshape/json-schema": "11.33.2",
-    "@takeshape/util": "11.33.2"
+    "@takeshape/errors": "11.36.0",
+    "@takeshape/util": "11.36.0",
+    "@takeshape/json-schema": "11.36.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.33.2"
+    "@takeshape/infra": "11.36.0"
   },
   "engines": {
     "node": ">=20"