@orq-ai/node 3.4.0-rc.37 → 3.6.0-rc.8

package/docs/sdks/datasets/README.md

@@ -10,6 +10,7 @@
 * [retrieve](#retrieve) - Retrieve a dataset
 * [update](#update) - Update a dataset
 * [delete](#delete) - Delete a dataset
+* [createExperiment](#createexperiment) - Create an experiment from a dataset
 * [listDatapoints](#listdatapoints) - List datapoints
 * [createDatapoint](#createdatapoint) - Create a datapoint
 * [retrieveDatapoint](#retrievedatapoint) - Retrieve a datapoint
@@ -105,8 +106,8 @@ const orq = new Orq({
 
 async function run() {
   const result = await orq.datasets.create({
-    displayName: "Jed6",
-    path: "Customer Service/Billing/Refund",
+    displayName: "Neva.Raynor10",
+    path: "Default",
   });
 
   // Handle the result
@@ -132,8 +133,8 @@ const orq = new OrqCore({
 
 async function run() {
   const res = await datasetsCreate(orq, {
-    displayName: "Jed6",
-    path: "Customer Service/Billing/Refund",
+    displayName: "Neva.Raynor10",
+    path: "Default",
   });
 
   if (!res.ok) {
@@ -262,7 +263,7 @@ async function run() {
   const result = await orq.datasets.update({
     datasetId: "<id>",
     requestBody: {
-      path: "Customer Service/Billing/Refund",
+      path: "Default",
     },
   });
 
@@ -291,7 +292,7 @@ async function run() {
   const res = await datasetsUpdate(orq, {
     datasetId: "<id>",
     requestBody: {
-      path: "Customer Service/Billing/Refund",
+      path: "Default",
     },
   });
 
@@ -402,6 +403,92 @@ run();
 | --------------- | --------------- | --------------- |
 | errors.APIError | 4XX, 5XX        | \*/\*           |
 
+## createExperiment
+
+Create an experiment from a dataset
+
+### Example Usage
+
+```typescript
+import { Orq } from "@orq-ai/node";
+
+const orq = new Orq({
+  apiKey: process.env["ORQ_API_KEY"] ?? "",
+});
+
+async function run() {
+  const result = await orq.datasets.createExperiment({
+    datasetId: "<id>",
+    requestBody: {
+      experimentKey: "<value>",
+      path: "Default/Experiments",
+      type: "dataset_experiment",
+    },
+  });
+
+  // Handle the result
+  console.log(result);
+}
+
+run();
+```
+
+### Standalone function
+
+The standalone function version of this method:
+
+```typescript
+import { OrqCore } from "@orq-ai/node/core.js";
+import { datasetsCreateExperiment } from "@orq-ai/node/funcs/datasetsCreateExperiment.js";
+
+// Use `OrqCore` for best tree-shaking performance.
+// You can create one instance of it to use across an application.
+const orq = new OrqCore({
+  apiKey: process.env["ORQ_API_KEY"] ?? "",
+});
+
+async function run() {
+  const res = await datasetsCreateExperiment(orq, {
+    datasetId: "<id>",
+    requestBody: {
+      experimentKey: "<value>",
+      path: "Default/Experiments",
+      type: "dataset_experiment",
+    },
+  });
+
+  if (!res.ok) {
+    throw res.error;
+  }
+
+  const { value: result } = res;
+
+  // Handle the result
+  console.log(result);
+}
+
+run();
+```
+
+### Parameters
+
+| Parameter                                                                                                                                                                      | Type                                                                                                                                                                           | Required                                                                                                                                                                       | Description                                                                                                                                                                    |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `request`                                                                                                                                                                      | [operations.CreateDatasetExperimentRequest](../../models/operations/createdatasetexperimentrequest.md)                                                                         | :heavy_check_mark:                                                                                                                                                             | The request object to use for the request.                                                                                                                                     |
+| `options`                                                                                                                                                                      | RequestOptions                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                             | Used to set various options for making HTTP requests.                                                                                                                          |
+| `options.fetchOptions`                                                                                                                                                         | [RequestInit](https://developer.mozilla.org/en-US/docs/Web/API/Request/Request#options)                                                                                        | :heavy_minus_sign:                                                                                                                                                             | Options that are passed to the underlying HTTP request. This can be used to inject extra headers for examples. All `Request` options, except `method` and `body`, are allowed. |
+| `options.retries`                                                                                                                                                              | [RetryConfig](../../lib/utils/retryconfig.md)                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                             | Enables retrying HTTP requests under certain failure conditions.                                                                                                               |
+
+### Response
+
+**Promise\<[operations.CreateDatasetExperimentResponseBody](../../models/operations/createdatasetexperimentresponsebody.md)\>**
+
+### Errors
+
+| Error Type      | Status Code     | Content Type    |
+| --------------- | --------------- | --------------- |
+| errors.APIError | 4XX, 5XX        | \*/\*           |
+
 ## listDatapoints
 
 Retrieves a paginated list of datapoints from a specific dataset.

package/docs/sdks/deployments/README.md

@@ -9,6 +9,7 @@
 * [getConfig](#getconfig) - Get config
 * [invoke](#invoke) - Invoke
 * [stream](#stream) - Stream
+* [createExperiment](#createexperiment) - Create an experiment from a deployment
 
 ## list
 
@@ -311,6 +312,94 @@ run();
 
 ### Errors
 
+| Error Type      | Status Code     | Content Type    |
+| --------------- | --------------- | --------------- |
+| errors.APIError | 4XX, 5XX        | \*/\*           |
+
+## createExperiment
+
+Create an experiment from a deployment
+
+### Example Usage
+
+```typescript
+import { Orq } from "@orq-ai/node";
+
+const orq = new Orq({
+  apiKey: process.env["ORQ_API_KEY"] ?? "",
+});
+
+async function run() {
+  const result = await orq.deployments.createExperiment({
+    deploymentKey: "<value>",
+    requestBody: {
+      experimentKey: "<value>",
+      path: "Default/Experiments",
+      datasetId: "<id>",
+      type: "deployment_experiment",
+    },
+  });
+
+  // Handle the result
+  console.log(result);
+}
+
+run();
+```
+
+### Standalone function
+
+The standalone function version of this method:
+
+```typescript
+import { OrqCore } from "@orq-ai/node/core.js";
+import { deploymentsCreateExperiment } from "@orq-ai/node/funcs/deploymentsCreateExperiment.js";
+
+// Use `OrqCore` for best tree-shaking performance.
+// You can create one instance of it to use across an application.
+const orq = new OrqCore({
+  apiKey: process.env["ORQ_API_KEY"] ?? "",
+});
+
+async function run() {
+  const res = await deploymentsCreateExperiment(orq, {
+    deploymentKey: "<value>",
+    requestBody: {
+      experimentKey: "<value>",
+      path: "Default/Experiments",
+      datasetId: "<id>",
+      type: "deployment_experiment",
+    },
+  });
+
+  if (!res.ok) {
+    throw res.error;
+  }
+
+  const { value: result } = res;
+
+  // Handle the result
+  console.log(result);
+}
+
+run();
+```
+
+### Parameters
+
+| Parameter                                                                                                                                                                      | Type                                                                                                                                                                           | Required                                                                                                                                                                       | Description                                                                                                                                                                    |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `request`                                                                                                                                                                      | [operations.CreateDeploymentExperimentRequest](../../models/operations/createdeploymentexperimentrequest.md)                                                                   | :heavy_check_mark:                                                                                                                                                             | The request object to use for the request.                                                                                                                                     |
+| `options`                                                                                                                                                                      | RequestOptions                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                             | Used to set various options for making HTTP requests.                                                                                                                          |
+| `options.fetchOptions`                                                                                                                                                         | [RequestInit](https://developer.mozilla.org/en-US/docs/Web/API/Request/Request#options)                                                                                        | :heavy_minus_sign:                                                                                                                                                             | Options that are passed to the underlying HTTP request. This can be used to inject extra headers for examples. All `Request` options, except `method` and `body`, are allowed. |
+| `options.retries`                                                                                                                                                              | [RetryConfig](../../lib/utils/retryconfig.md)                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                             | Enables retrying HTTP requests under certain failure conditions.                                                                                                               |
+
+### Response
+
+**Promise\<[operations.CreateDeploymentExperimentResponseBody](../../models/operations/createdeploymentexperimentresponsebody.md)\>**
+
+### Errors
+
 | Error Type      | Status Code     | Content Type    |
 | --------------- | --------------- | --------------- |
 | errors.APIError | 4XX, 5XX        | \*/\*           |

package/docs/sdks/knowledge/README.md

@@ -110,7 +110,7 @@ async function run() {
   const result = await orq.knowledge.create({
     key: "<key>",
     embeddingModel: "<value>",
-    path: "Customer Service/Billing/Refund",
+    path: "Default",
   });
 
   // Handle the result
@@ -138,7 +138,7 @@ async function run() {
   const res = await knowledgeCreate(orq, {
     key: "<key>",
     embeddingModel: "<value>",
-    path: "Customer Service/Billing/Refund",
+    path: "Default",
   });
 
   if (!res.ok) {
@@ -266,7 +266,7 @@ async function run() {
   const result = await orq.knowledge.update({
     knowledgeId: "<id>",
     requestBody: {
-      path: "Customer Service/Billing/Refund",
+      path: "Default",
     },
   });
 
@@ -295,7 +295,7 @@ async function run() {
   const res = await knowledgeUpdate(orq, {
     knowledgeId: "<id>",
     requestBody: {
-      path: "Customer Service/Billing/Refund",
+      path: "Default",
     },
   });
 
@@ -733,7 +733,7 @@ async function run() {
     knowledgeId: "<id>",
     datasourceId: "<id>",
     requestBody: {
-      displayName: "Haylee_Braun",
+      displayName: "Tony_Roberts",
     },
   });
 
@@ -763,7 +763,7 @@ async function run() {
     knowledgeId: "<id>",
     datasourceId: "<id>",
     requestBody: {
-      displayName: "Haylee_Braun",
+      displayName: "Tony_Roberts",
     },
   });
 
@@ -816,17 +816,6 @@ async function run() {
   const result = await orq.knowledge.createChunks({
     knowledgeId: "<id>",
     datasourceId: "<id>",
-    requestBody: [
-      {
-        text: "<value>",
-      },
-      {
-        text: "<value>",
-      },
-      {
-        text: "<value>",
-      },
-    ],
   });
 
   // Handle the result
@@ -854,17 +843,6 @@ async function run() {
   const res = await knowledgeCreateChunks(orq, {
     knowledgeId: "<id>",
     datasourceId: "<id>",
-    requestBody: [
-      {
-        text: "<value>",
-      },
-      {
-        text: "<value>",
-      },
-      {
-        text: "<value>",
-      },
-    ],
   });
 
   if (!res.ok) {

package/docs/sdks/models/README.md

@@ -0,0 +1,79 @@
+# Models
+(*models*)
+
+## Overview
+
+### Available Operations
+
+* [list](#list) - List models
+
+## list
+
+Lists the currently available models, and provides basic information about each one such as the owner and availability.
+
+### Example Usage
+
+```typescript
+import { Orq } from "@orq-ai/node";
+
+const orq = new Orq({
+  apiKey: process.env["ORQ_API_KEY"] ?? "",
+});
+
+async function run() {
+  const result = await orq.models.list();
+
+  // Handle the result
+  console.log(result);
+}
+
+run();
+```
+
+### Standalone function
+
+The standalone function version of this method:
+
+```typescript
+import { OrqCore } from "@orq-ai/node/core.js";
+import { modelsList } from "@orq-ai/node/funcs/modelsList.js";
+
+// Use `OrqCore` for best tree-shaking performance.
+// You can create one instance of it to use across an application.
+const orq = new OrqCore({
+  apiKey: process.env["ORQ_API_KEY"] ?? "",
+});
+
+async function run() {
+  const res = await modelsList(orq);
+
+  if (!res.ok) {
+    throw res.error;
+  }
+
+  const { value: result } = res;
+
+  // Handle the result
+  console.log(result);
+}
+
+run();
+```
+
+### Parameters
+
+| Parameter                                                                                                                                                                      | Type                                                                                                                                                                           | Required                                                                                                                                                                       | Description                                                                                                                                                                    |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `options`                                                                                                                                                                      | RequestOptions                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                             | Used to set various options for making HTTP requests.                                                                                                                          |
+| `options.fetchOptions`                                                                                                                                                         | [RequestInit](https://developer.mozilla.org/en-US/docs/Web/API/Request/Request#options)                                                                                        | :heavy_minus_sign:                                                                                                                                                             | Options that are passed to the underlying HTTP request. This can be used to inject extra headers for examples. All `Request` options, except `method` and `body`, are allowed. |
+| `options.retries`                                                                                                                                                              | [RetryConfig](../../lib/utils/retryconfig.md)                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                             | Enables retrying HTTP requests under certain failure conditions.                                                                                                               |
+
+### Response
+
+**Promise\<[operations.ListModelsResponseBody](../../models/operations/listmodelsresponsebody.md)\>**
+
+### Errors
+
+| Error Type      | Status Code     | Content Type    |
+| --------------- | --------------- | --------------- |
+| errors.APIError | 4XX, 5XX        | \*/\*           |

package/docs/sdks/orq/README.md

@@ -2,83 +2,9 @@
 
 ## Overview
 
-[Dev] orq.ai API: orq.ai API documentation
+orq.ai API: orq.ai API documentation
 
 orq.ai Documentation
 <https://docs.orq.ai>
 
 ### Available Operations
-
-* [postV2TracesSessionsCount](#postv2tracessessionscount) - Get total count of sessions
-
-## postV2TracesSessionsCount
-
-Get total count of sessions
-
-### Example Usage
-
-```typescript
-import { Orq } from "@orq-ai/node";
-
-const orq = new Orq({
-  apiKey: process.env["ORQ_API_KEY"] ?? "",
-});
-
-async function run() {
-  const result = await orq.postV2TracesSessionsCount();
-
-  // Handle the result
-  console.log(result);
-}
-
-run();
-```
-
-### Standalone function
-
-The standalone function version of this method:
-
-```typescript
-import { OrqCore } from "@orq-ai/node/core.js";
-import { postV2TracesSessionsCount } from "@orq-ai/node/funcs/postV2TracesSessionsCount.js";
-
-// Use `OrqCore` for best tree-shaking performance.
-// You can create one instance of it to use across an application.
-const orq = new OrqCore({
-  apiKey: process.env["ORQ_API_KEY"] ?? "",
-});
-
-async function run() {
-  const res = await postV2TracesSessionsCount(orq);
-
-  if (!res.ok) {
-    throw res.error;
-  }
-
-  const { value: result } = res;
-
-  // Handle the result
-  console.log(result);
-}
-
-run();
-```
-
-### Parameters
-
-| Parameter                                                                                                                                                                      | Type                                                                                                                                                                           | Required                                                                                                                                                                       | Description                                                                                                                                                                    |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `request`                                                                                                                                                                      | [operations.PostV2TracesSessionsCountRequestBody](../../models/operations/postv2tracessessionscountrequestbody.md)                                                             | :heavy_check_mark:                                                                                                                                                             | The request object to use for the request.                                                                                                                                     |
-| `options`                                                                                                                                                                      | RequestOptions                                                                                                                                                                 | :heavy_minus_sign:                                                                                                                                                             | Used to set various options for making HTTP requests.                                                                                                                          |
-| `options.fetchOptions`                                                                                                                                                         | [RequestInit](https://developer.mozilla.org/en-US/docs/Web/API/Request/Request#options)                                                                                        | :heavy_minus_sign:                                                                                                                                                             | Options that are passed to the underlying HTTP request. This can be used to inject extra headers for examples. All `Request` options, except `method` and `body`, are allowed. |
-| `options.retries`                                                                                                                                                              | [RetryConfig](../../lib/utils/retryconfig.md)                                                                                                                                  | :heavy_minus_sign:                                                                                                                                                             | Enables retrying HTTP requests under certain failure conditions.                                                                                                               |
-
-### Response
-
-**Promise\<[operations.PostV2TracesSessionsCountResponseBody](../../models/operations/postv2tracessessionscountresponsebody.md)\>**
-
-### Errors
-
-| Error Type      | Status Code     | Content Type    |
-| --------------- | --------------- | --------------- |
-| errors.APIError | 4XX, 5XX        | \*/\*           |

package/docs/sdks/prompts/README.md

@@ -100,39 +100,20 @@ const orq = new Orq({
 
 async function run() {
   const result = await orq.prompts.create({
-    displayName: "Jed6",
+    displayName: "Raymundo83",
     promptConfig: {
       messages: [
         {
-          role: "system",
+          role: "assistant",
           content: "<value>",
         },
-        {
-          role: "system",
-          content: [
-            {
-              type: "image_url",
-              imageUrl: {
-                url: "https://well-worn-formation.biz",
-              },
-            },
-            {
-              type: "text",
-              text: "<value>",
-            },
-            {
-              type: "text",
-              text: "<value>",
-            },
-          ],
-        },
         {
           role: "assistant",
           content: "<value>",
         },
       ],
     },
-    path: "Customer Service/Billing/Refund",
+    path: "Default",
   });
 
   // Handle the result
@@ -158,39 +139,20 @@ const orq = new OrqCore({
 
 async function run() {
   const res = await promptsCreate(orq, {
-    displayName: "Jed6",
+    displayName: "Raymundo83",
     promptConfig: {
       messages: [
         {
-          role: "system",
+          role: "assistant",
           content: "<value>",
         },
-        {
-          role: "system",
-          content: [
-            {
-              type: "image_url",
-              imageUrl: {
-                url: "https://well-worn-formation.biz",
-              },
-            },
-            {
-              type: "text",
-              text: "<value>",
-            },
-            {
-              type: "text",
-              text: "<value>",
-            },
-          ],
-        },
         {
           role: "assistant",
           content: "<value>",
         },
       ],
     },
-    path: "Customer Service/Billing/Refund",
+    path: "Default",
   });
 
   if (!res.ok) {
@@ -318,7 +280,7 @@ async function run() {
   const result = await orq.prompts.update({
     id: "<id>",
     requestBody: {
-      path: "Customer Service/Billing/Refund",
+      path: "Default",
     },
   });
 
@@ -347,7 +309,7 @@ async function run() {
   const res = await promptsUpdate(orq, {
     id: "<id>",
     requestBody: {
-      path: "Customer Service/Billing/Refund",
+      path: "Default",
     },
   });
 

package/funcs/{memoryStoresRetrieveMemory.d.ts → datasetsCreateExperiment.d.ts}

@@ -7,10 +7,10 @@ import * as operations from "../models/operations/index.js";
 import { APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 /**
- * Retrieve a specific memory
+ * Create an experiment from a dataset
  *
  * @remarks
- * Retrieves details of a specific memory by its ID
+ * Create an experiment from a dataset
  */
-export declare function memoryStoresRetrieveMemory(client: OrqCore, request: operations.RetrieveMemoryRequest, options?: RequestOptions): APIPromise<Result<operations.RetrieveMemoryResponseBody, APIError | SDKValidationError | UnexpectedClientError | InvalidRequestError | RequestAbortedError | RequestTimeoutError | ConnectionError>>;
-//# sourceMappingURL=memoryStoresRetrieveMemory.d.ts.map
+export declare function datasetsCreateExperiment(client: OrqCore, request: operations.CreateDatasetExperimentRequest, options?: RequestOptions): APIPromise<Result<operations.CreateDatasetExperimentResponseBody, APIError | SDKValidationError | UnexpectedClientError | InvalidRequestError | RequestAbortedError | RequestTimeoutError | ConnectionError>>;
+//# sourceMappingURL=datasetsCreateExperiment.d.ts.map

package/funcs/{memoryStoresCreateMemory.d.ts.map → datasetsCreateExperiment.d.ts.map}

@@ -1 +1 @@
-{"version":3,"file":"memoryStoresCreateMemory.d.ts","sourceRoot":"","sources":["../src/funcs/memoryStoresCreateMemory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAKrC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAW,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,UAAU,CAAC,mBAAmB,EACvC,OAAO,CAAC,EAAE,cAAc,GACvB,UAAU,CACX,MAAM,CACJ,UAAU,CAAC,wBAAwB,EACjC,QAAQ,GACR,kBAAkB,GAClB,qBAAqB,GACrB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,eAAe,CAClB,CACF,CAMA"}
+{"version":3,"file":"datasetsCreateExperiment.d.ts","sourceRoot":"","sources":["../src/funcs/datasetsCreateExperiment.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAKrC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAW,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,UAAU,CAAC,8BAA8B,EAClD,OAAO,CAAC,EAAE,cAAc,GACvB,UAAU,CACX,MAAM,CACJ,UAAU,CAAC,mCAAmC,EAC5C,QAAQ,GACR,kBAAkB,GAClB,qBAAqB,GACrB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,eAAe,CAClB,CACF,CAMA"}