Fix conflict

nathan-contino · nathan-contino · commit dc2cd6622c20 · 2025-05-27T11:43:27.000-04:00
diff --git a/docs/data-ai/_index.md b/docs/data-ai/_index.md
@@ -37,7 +37,7 @@ You can also monitor your machines through teleop, power your application logic,
 {{< cards >}}
 {{% card link="/data-ai/data/query/" noimage="true" %}}
 {{% card link="/data-ai/data/visualize/" noimage="true" %}}
-{{% card link="/data-ai/data/advanced/alert-data/" noimage="true" %}}
+{{% card link="/data-ai/data/alert-data/" noimage="true" %}}
 {{% card link="/data-ai/data/export/" noimage="true" %}}
 {{< /cards >}}
 {{< /how-to-expand >}}
@@ -48,9 +48,9 @@ You can also monitor your machines through teleop, power your application logic,
 {{% card link="/data-ai/ai/train-tflite/" noimage="true" %}}
 {{% card link="/data-ai/ai/train/" noimage="true" %}}
 {{% card link="/data-ai/ai/deploy/" noimage="true" %}}
-{{% card link="/data-ai/ai/run-inference/" noimage="true" %}}
-{{% card link="/data-ai/ai/alert/" noimage="true" %}}
-{{% card link="/data-ai/ai/act/" noimage="true" %}}
+{{% card link="/data-ai/inference/run-inference/" noimage="true" %}}
+{{% card link="/data-ai/inference/alert/" noimage="true" %}}
+{{% card link="/data-ai/inference/act/" noimage="true" %}}
 {{< /cards >}}
 {{< /how-to-expand >}}
 
diff --git a/docs/data-ai/ai/_index.md b/docs/data-ai/ai/_index.md
@@ -1,6 +1,6 @@
 ---
-linkTitle: "Leverage AI"
-title: "Leverage AI"
+linkTitle: "Train an ML model"
+title: "Train an ML model"
 weight: 300
 layout: "empty"
 type: "docs"
diff --git a/docs/data-ai/ai/deploy.md b/docs/data-ai/ai/deploy.md
@@ -83,7 +83,7 @@ The service works with models trained inside and outside the Viam app:
 On its own the ML model service only runs the model.
 After deploying your model, you need to configure an additional service to use the deployed model.
 For example, you can configure an [`mlmodel` vision service](/operate/reference/services/vision/) to visualize the inferences your model makes.
-Follow our docs to [run inference](/data-ai/ai/run-inference/) to add an `mlmodel` vision service and see inferences.
+Follow our docs to [run inference](/data-ai/inference/run-inference/) to add an `mlmodel` vision service and see inferences.
 
 For other use cases, consider [creating custom functionality with a module](/operate/get-started/other-hardware/).
 
diff --git a/docs/data-ai/ai/train-tflite.md b/docs/data-ai/ai/train-tflite.md
@@ -154,7 +154,7 @@ To capture images of edge cases and re-train your model using those images, comp
 ## Next steps
 
 Now your machine can make inferences about its environment.
-The next step is to [deploy](/data-ai/ai/deploy/) the ML model and then [act](/data-ai/ai/act/) or [alert](/data-ai/ai/alert/) based on these inferences.
+The next step is to [deploy](/data-ai/ai/deploy/) the ML model and then [act](/data-ai/inference/act/) or [alert](/data-ai/inference/alert/) based on these inferences.
 
 See the following tutorials for examples of using machine learning models to make your machine do things based on its inferences about its environment:
 
diff --git a/docs/data-ai/ai/train.md b/docs/data-ai/ai/train.md
@@ -846,4 +846,4 @@ You can also view your training jobs' logs with the [`viam train logs`](/dev/too
 {{< /table >}}
 
 To use your new model with machines, you must [deploy it](/data-ai/ai/deploy/) with the appropriate ML model service.
-Then you can use another service, such as the vision service, to [run inference](/data-ai/ai/run-inference/).
+Then you can use another service, such as the vision service, to [run inference](/data-ai/inference/run-inference/).
diff --git a/docs/data-ai/ai/upload-external-data.md b/docs/data-ai/ai/upload-external-data.md
@@ -13,7 +13,7 @@ aliases:
   - /how-tos/upload-data/
 date: "2024-12-04"
 description: "Upload data to the Viam app from your local computer or mobile device using the data client API, Viam CLI, or Viam mobile app."
-prev: "/data-ai/ai/act/"
+prev: "/data-ai/inference/act/"
 ---
 
 When you configure the data management service, Viam automatically uploads data from the default directory `~/.viam/capture` and any directory you configured.
diff --git a/docs/data-ai/capture-data/advanced/_index.md b/docs/data-ai/capture-data/advanced/_index.md
diff --git a/docs/data-ai/capture-data/capture-other-sources.md b/docs/data-ai/capture-data/capture-other-sources.md
diff --git a/docs/data-ai/capture-data/capture-sync.md b/docs/data-ai/capture-data/capture-sync.md
@@ -80,7 +80,7 @@ Some models do not support all options, for example webcams do not capture point
 
 {{< /expand >}}
 
-For instructions on configuring data capture and sync with JSON, go to [Advanced data capture and sync configurations](/data-ai/capture-data/advanced/advanced-data-capture-sync/) and follow the instructions for JSON examples.
+For instructions on configuring data capture and sync with JSON, go to [Advanced data capture and sync configurations](/data-ai/reference/advanced-data-capture-sync/) and follow the instructions for JSON examples.
 
 ## View captured data
 
@@ -121,12 +121,12 @@ For instructions on configuring data capture and sync with JSON, go to [Advanced
 For other ways to control data synchronization, see:
 
 - [Conditional sync](/data-ai/capture-data/conditional-sync/)
-- [Retention policies](/data-ai/capture-data/advanced/advanced-data-capture-sync/#cloud-data-retention)
-- [Sync optimization](/data-ai/capture-data/advanced/advanced-data-capture-sync/#sync-optimization)
+- [Retention policies](/data-ai/reference/advanced-data-capture-sync/#cloud-data-retention)
+- [Sync optimization](/data-ai/reference/advanced-data-capture-sync/#sync-optimization)
 
 {{< /alert >}}
 
 ## Next steps
 
-For more information on available configuration attributes and options like capturing directly to MongoDB or conditional sync, see [Advanced data capture and sync configurations](/data-ai/capture-data/advanced/advanced-data-capture-sync/).
+For more information on available configuration attributes and options like capturing directly to MongoDB or conditional sync, see [Advanced data capture and sync configurations](/data-ai/reference/advanced-data-capture-sync/).
 To leverage AI, you can now [create a dataset](/data-ai/ai/create-dataset/) with the data you've captured.
diff --git a/docs/data-ai/capture-data/conditional-sync.md b/docs/data-ai/capture-data/conditional-sync.md
@@ -1,5 +1,5 @@
 ---
-title: "Conditional cloud sync"
+title: "Conditional sync"
 linkTitle: "Conditional sync"
 description: "Trigger cloud sync to sync captured data when custom conditions are met."
 type: "docs"
@@ -15,7 +15,7 @@ aliases:
 languages: []
 viamresources: ["sensor", "data_manager"]
 platformarea: ["data", "registry"]
-next: /data-ai/capture-data/advanced/advanced-data-capture-sync/
+next: /data-ai/reference/advanced-data-capture-sync/
 date: "2024-12-04"
 ---
 
diff --git a/docs/data-ai/capture-data/filter-before-sync.md b/docs/data-ai/capture-data/filter-before-sync.md
@@ -1,5 +1,5 @@
 ---
-linkTitle: "Filter data"
+linkTitle: "Filter captured data"
 title: "Filter data before sync"
 weight: 13
 layout: "docs"
diff --git a/docs/data-ai/capture-data/how-sync-works.md b/docs/data-ai/capture-data/how-sync-works.md
@@ -2,13 +2,13 @@
 linkTitle: "How sync works"
 title: "How sync works"
 tags: ["data management", "data", "services"]
-weight: 12
+weight: 10
 layout: "docs"
 type: "docs"
 platformarea: ["data"]
 description: "Data capture and sync works differently for viam-server and viam-micro-server."
 date: "2024-12-18"
-prev: "/data-ai/capture-data/advanced/advanced-data-capture-sync/"
+prev: "/data-ai/reference/advanced-data-capture-sync/"
 ---
 
 Data capture and cloud sync works differently for `viam-server` and `viam-micro-server`.
@@ -115,4 +115,4 @@ If your robot is offline and can't sync and your machine's disk fills up beyond
 For more information, see [Automatic data deletion details](/data-ai/capture-data/advanced/how-sync-works/)
 
 Data capture supports capturing tabular data directly to MongoDB in addition to capturing to disk.
-For more information, see [Capture directly to MongoDB](/data-ai/capture-data/advanced/advanced-data-capture-sync/#capture-directly-to-your-own-mongodb-cluster).
+For more information, see [Capture directly to MongoDB](/data-ai/reference/advanced-data-capture-sync/#capture-directly-to-your-own-mongodb-cluster).
diff --git a/docs/data-ai/data/advanced/_index.md b/docs/data-ai/data/advanced/_index.md
diff --git a/docs/data-ai/data/alert-data.md b/docs/data-ai/data/alert-data.md
@@ -1,5 +1,5 @@
 ---
-linkTitle: "Alert on data"
+linkTitle: "Alert"
 title: "Alert on data"
 weight: 60
 layout: "docs"
diff --git a/docs/data-ai/data/export.md b/docs/data-ai/data/export.md
@@ -1,5 +1,5 @@
 ---
-linkTitle: "Export data"
+linkTitle: "Export"
 title: "Export data"
 weight: 40
 description: "Download data from the Viam app using the data client API or the Viam CLI."
@@ -15,7 +15,7 @@ aliases:
 viamresources: ["sensor", "data_manager"]
 platformarea: ["data", "cli"]
 date: "2024-12-03"
-next: "/data-ai/data/advanced/alert-data/"
+next: "/data-ai/data/alert-data/"
 ---
 
 You can download machine data from cloud storage to your computer with the Viam CLI.
diff --git a/docs/data-ai/data/query.md b/docs/data-ai/data/query.md
@@ -1,5 +1,5 @@
 ---
-linkTitle: "Query data"
+linkTitle: "Query"
 title: "Query data"
 weight: 20
 layout: "docs"
diff --git a/docs/data-ai/data/visualize.md b/docs/data-ai/data/visualize.md
@@ -1,5 +1,5 @@
 ---
-linkTitle: "Visualize data"
+linkTitle: "Visualize"
 title: "Visualize data"
 weight: 20
 layout: "docs"
diff --git a/docs/data-ai/inference/_index.md b/docs/data-ai/inference/_index.md
@@ -0,0 +1,10 @@
+---
+linkTitle: "Run inference"
+title: "Run inference"
+weight: 300
+layout: "empty"
+type: "docs"
+empty_node: true
+open_on_desktop: true
+header_only: true
+---
diff --git a/docs/data-ai/inference/act.md b/docs/data-ai/inference/act.md
@@ -5,7 +5,7 @@ weight: 70
 layout: "docs"
 type: "docs"
 description: "Use the vision service API to act based on inferences."
-next: "/data-ai/ai/advanced/upload-external-data/"
+next: "/data-ai/ai/upload-external-data/"
 ---
 
 You can use the [vision service API](/dev/reference/apis/services/vision/) to get information about your machine's inferences and program behavior based on that.
diff --git a/docs/data-ai/inference/alert.md b/docs/data-ai/inference/alert.md
@@ -21,7 +21,7 @@ For example, a trigger could alert you when a camera feed detects an anomaly.
 
 {{< expand "A configured camera and vision service." >}}
 
-Follow the instructions to [configure a camera](/operate/reference/components/camera/) and [run inference](/data-ai/ai/run-inference/).
+Follow the instructions to [configure a camera](/operate/reference/components/camera/) and [run inference](/data-ai/inference/run-inference/).
 
 {{< /expand >}}
 
diff --git a/docs/data-ai/inference/run-inference.md b/docs/data-ai/inference/run-inference.md
@@ -1,6 +1,6 @@
 ---
 linkTitle: "Run inference"
-title: "Run inference"
+title: "Run inference on a model"
 weight: 50
 layout: "docs"
 type: "docs"
diff --git a/docs/data-ai/quickstart/_index.md b/docs/data-ai/quickstart/_index.md
@@ -0,0 +1,10 @@
+---
+linkTitle: "Quickstart"
+title: "Quickstart"
+weight: 1
+layout: "empty"
+type: "docs"
+empty_node: true
+open_on_desktop: true
+header_only: true
+---
diff --git a/docs/data-ai/quickstart/capture.md b/docs/data-ai/quickstart/capture.md
@@ -0,0 +1,9 @@
+---
+linkTitle: "Capture"
+title: "Capture"
+weight: 20
+layout: "docs"
+type: "docs"
+description: "Use the vision service API to act based on inferences."
+next: "/data-ai/ai/upload-external-data/"
+---
diff --git a/docs/data-ai/quickstart/infer.md b/docs/data-ai/quickstart/infer.md
@@ -0,0 +1,9 @@
+---
+linkTitle: "Infer"
+title: "Infer"
+weight: 30
+layout: "docs"
+type: "docs"
+description: "Use the vision service API to act based on inferences."
+next: "/data-ai/ai/upload-external-data/"
+---
diff --git a/docs/data-ai/quickstart/setup.md b/docs/data-ai/quickstart/setup.md
@@ -0,0 +1,9 @@
+---
+linkTitle: "Setup"
+title: "Setup"
+weight: 10
+layout: "docs"
+type: "docs"
+description: "Use the vision service API to act based on inferences."
+next: "/data-ai/ai/upload-external-data/"
+---
diff --git a/docs/data-ai/reference/advanced-data-capture-sync.md b/docs/data-ai/reference/advanced-data-capture-sync.md
@@ -1,6 +1,6 @@
 ---
-linkTitle: "Advanced data capture and sync configurations"
-title: "Advanced data capture and sync configurations"
+linkTitle: "Sync configuration"
+title: "Sync configuration"
 tags: ["data management", "data", "services"]
 weight: 10
 layout: "docs"
@@ -705,9 +705,9 @@ Failing to write to MongoDB doesn't affect capturing and syncing data to cloud s
 Configure how long your synced data remains stored in the cloud:
 
 - **Retain data up to a certain size (for example, 100GB) or for a specific length of time (for example, 14 days):** Set `retention_policies` at the resource level.
-  See the `retention_policy` field in [data capture configuration attributes](/data-ai/capture-data/advanced/advanced-data-capture-sync/#click-to-view-data-capture-attributes).
+  See the `retention_policy` field in [data capture configuration attributes](/data-ai/reference/advanced-data-capture-sync/#click-to-view-data-capture-attributes).
 - **Delete data captured by a machine when you delete the machine:** Control whether your cloud data is deleted when a machine or machine part is removed.
-  See the `delete_data_on_part_deletion` field in the [data management service configuration attributes](/data-ai/capture-data/advanced/advanced-data-capture-sync/#click-to-view-data-management-attributes).
+  See the `delete_data_on_part_deletion` field in the [data management service configuration attributes](/data-ai/reference/advanced-data-capture-sync/#click-to-view-data-management-attributes).
 
 ### Sync optimization
 
diff --git a/docs/data-ai/reference/api/_index.md b/docs/data-ai/reference/api/_index.md
@@ -1,7 +1,7 @@
 ---
-linkTitle: "Advanced"
-title: "Advanced"
-weight: 200
+linkTitle: "APIs"
+title: "APIs"
+weight: 500
 layout: "empty"
 type: "docs"
 empty_node: true
diff --git a/docs/data-ai/reference/api/data-client.md b/docs/data-ai/reference/api/data-client.md
diff --git a/docs/data-ai/reference/api/data-management-client.md b/docs/data-ai/reference/api/data-management-client.md
diff --git a/docs/data-ai/reference/api/ml-model-client.md b/docs/data-ai/reference/api/ml-model-client.md
diff --git a/docs/data-ai/reference/api/ml-training-client.md b/docs/data-ai/reference/api/ml-training-client.md
diff --git a/docs/data-ai/reference/api/vision-client.md b/docs/data-ai/reference/api/vision-client.md
diff --git a/docs/data-ai/reference/triggers-configuration.md b/docs/data-ai/reference/triggers-configuration.md
@@ -11,8 +11,8 @@ date: "2025-05-05"
 Triggers can alert you by email or webhook when the following events occur:
 
 - [machine telemetry data syncs from your local device to the Viam cloud](/manage/troubleshoot/alert/)
-- [data syncs from a machine](/data-ai/data/advanced/alert-data/)
-- [service detects a specified object or classifies a specified label](/data-ai/ai/alert/)
+- [data syncs from a machine](/data-ai/data/alert-data/)
+- [service detects a specified object or classifies a specified label](/data-ai/inference/alert/)
 
 ## Trigger attributes
 
diff --git a/docs/dev/reference/changelog.md b/docs/dev/reference/changelog.md
@@ -221,7 +221,7 @@ It is not possible to store metadata associated with a Viam user.
 
 {{% changelog color="added" title="Hot Data Store" date="2025-03-11" %}}
 
-The [hot data store](/data-ai/capture-data/advanced/advanced-data-capture-sync/#capture-to-the-hot-data-store) allows you to access recent data faster.
+The [hot data store](/data-ai/reference/advanced-data-capture-sync/#capture-to-the-hot-data-store) allows you to access recent data faster.
 
 {{% /changelog %}}
 
@@ -591,7 +591,7 @@ See [Visualize data with Grafana](/tutorials/services/visualize-data-grafana/) f
 
 {{% changelog date="2024-01-31" color="added" title="Use triggers to trigger actions" %}}
 
-You can now configure [triggers](/data-ai/data/advanced/alert-data/) (previously called webhooks) to execute actions when certain types of data are sent from your machine to the cloud.
+You can now configure [triggers](/data-ai/data/alert-data/) (previously called webhooks) to execute actions when certain types of data are sent from your machine to the cloud.
 
 {{% /changelog %}}
 
diff --git a/docs/manage/troubleshoot/teleoperate/default-interface.md b/docs/manage/troubleshoot/teleoperate/default-interface.md
@@ -45,7 +45,7 @@ Additionally, the app allows you to:
 
 - see if your machines are online
 - [view a machine's logs](/manage/troubleshoot/troubleshoot/#check-logs)
-- [upload images from your phone to the cloud](/data-ai/ai/advanced/upload-external-data/#upload-images-with-the-viam-mobile-app)
+- [upload images from your phone to the cloud](/data-ai/ai/upload-external-data/#upload-images-with-the-viam-mobile-app)
 - [invite people to collaborate with you and modify access](/manage/troubleshoot/teleoperate/default-interface/#viam-mobile-app)
 
 <br>
diff --git a/docs/operate/mobility/use-input-to-act.md b/docs/operate/mobility/use-input-to-act.md
@@ -51,9 +51,9 @@ readings = await my_sensor.get_readings()
 Other common inputs include the methods of a [board](/dev/reference/apis/components/board/) (`GetGPIO`, `GetPWM`, `PWMFrequency`, `GetDigitalInterruptValue`, and `ReadAnalogReader`), or a [power sensor](/dev/reference/apis/components/power-sensor/) (`GetVoltage`, `GetCurrent`, `GetPower`, and `GetReadings`).
 
 You can also use camera input, for example to detect objects and pick them up with an arm.
-See [Act based on inferences](/data-ai/ai/act/) for relevant examples.
+See [Act based on inferences](/data-ai/inference/act/) for relevant examples.
 
-If you want to send alerts based on computer vision or captured data, see [Alert on inferences](/data-ai/ai/alert/) or [Alert on data](/data-ai/data/advanced/alert-data/).
+If you want to send alerts based on computer vision or captured data, see [Alert on inferences](/data-ai/inference/alert/) or [Alert on data](/data-ai/data/alert-data/).
 
 {{% /tablestep %}}
 {{% tablestep number=3 %}}
diff --git a/docs/operate/reference/components/camera/webcam.md b/docs/operate/reference/components/camera/webcam.md
@@ -272,7 +272,7 @@ If you are using a CSI camera v1.3 or v2.0, or v3.0 with a Raspberry Pi, use the
 For CSI cameras used with Jetsons, use the `viam:camera:csi` model provided by the same module.
 
 For Raspberry Pi AI cameras like the IMX500 AI camera, use a module such as [this `viam-pi-ai-camera` vision service](https://github.com/HipsterBrown/viam-pi-ai-camera).
-For more information about the vision service, see [run inference](https://docs.viam.com/data-ai/ai/run-inference/).
+For more information about the vision service, see [run inference](https://docs.viam.com/data-ai/inference/run-inference/).
 {{% /expand%}}
 
 {{% expand "High CPU usage" %}}
diff --git a/docs/operate/reference/services/vision/_index.md b/docs/operate/reference/services/vision/_index.md
@@ -4,5 +4,5 @@ linkTitle: "Vision Service"
 weight: 20
 type: "docs"
 layout: "empty"
-canonical: "/data-ai/ai/run-inference/"
+canonical: "/data-ai/inference/run-inference/"
 ---
diff --git a/docs/tutorials/projects/helmet.md b/docs/tutorials/projects/helmet.md
@@ -251,7 +251,7 @@ Now that you have verified that the detector and data sync are working, modify y
 
 ## Set up email notifications
 
-[Triggers](/data-ai/ai/alert/) allow you to send webhook requests or email notifications when certain events happen.
+[Triggers](/data-ai/inference/alert/) allow you to send webhook requests or email notifications when certain events happen.
 
 For example, you can set up a trigger to perform an action whenever an image of someone without a hard hat is uploaded to the cloud.
 
