viam-sdk 0.25.2__py3-none-linux_armv7l.whl → 0.62.0__py3-none-linux_armv7l.whl

viam/app/app_client.py

@@ -12,6 +12,7 @@ from viam.proto.app import (
     AddRoleRequest,
     APIKeyWithAuthorizations,
     AppServiceStub,
+    AuthenticatorInfo,
     Authorization,
     AuthorizedPermissions,
     ChangeRoleRequest,
@@ -47,16 +48,18 @@ from viam.proto.app import (
     DeleteRobotPartRequest,
     DeleteRobotPartSecretRequest,
     DeleteRobotRequest,
-)
-from viam.proto.app import Fragment as FragmentPB
-from viam.proto.app import FragmentVisibility as FragmentVisibilityPB
-from viam.proto.app import (
+    GetFragmentHistoryRequest,
+    GetFragmentHistoryResponse,
     GetFragmentRequest,
     GetFragmentResponse,
+    GetLocationMetadataRequest,
+    GetLocationMetadataResponse,
     GetLocationRequest,
     GetLocationResponse,
     GetModuleRequest,
     GetModuleResponse,
+    GetOrganizationMetadataRequest,
+    GetOrganizationMetadataResponse,
     GetOrganizationNamespaceAvailabilityRequest,
     GetOrganizationNamespaceAvailabilityResponse,
     GetOrganizationRequest,
@@ -67,10 +70,14 @@ from viam.proto.app import (
     GetRegistryItemResponse,
     GetRobotAPIKeysRequest,
     GetRobotAPIKeysResponse,
+    GetRobotMetadataRequest,
+    GetRobotMetadataResponse,
     GetRobotPartHistoryRequest,
     GetRobotPartHistoryResponse,
     GetRobotPartLogsRequest,
     GetRobotPartLogsResponse,
+    GetRobotPartMetadataRequest,
+    GetRobotPartMetadataResponse,
     GetRobotPartRequest,
     GetRobotPartResponse,
     GetRobotPartsRequest,
@@ -125,10 +132,6 @@ from viam.proto.app import (
     ResendOrganizationInviteRequest,
     ResendOrganizationInviteResponse,
     Robot,
-)
-from viam.proto.app import RobotPart as RobotPartPB
-from viam.proto.app import RobotPartHistoryEntry as RobotPartHistoryEntryPB
-from viam.proto.app import (
     RotateKeyRequest,
     RotateKeyResponse,
     RoverRentalRobot,
@@ -139,15 +142,23 @@ from viam.proto.app import (
     UnshareLocationRequest,
     UpdateFragmentRequest,
     UpdateFragmentResponse,
+    UpdateLocationMetadataRequest,
+    UpdateLocationMetadataResponse,
     UpdateLocationRequest,
     UpdateLocationResponse,
     UpdateModuleRequest,
     UpdateModuleResponse,
     UpdateOrganizationInviteAuthorizationsRequest,
     UpdateOrganizationInviteAuthorizationsResponse,
+    UpdateOrganizationMetadataRequest,
+    UpdateOrganizationMetadataResponse,
     UpdateOrganizationRequest,
     UpdateOrganizationResponse,
     UpdateRegistryItemRequest,
+    UpdateRobotMetadataRequest,
+    UpdateRobotMetadataResponse,
+    UpdateRobotPartMetadataRequest,
+    UpdateRobotPartMetadataResponse,
     UpdateRobotPartRequest,
     UpdateRobotPartResponse,
     UpdateRobotRequest,
@@ -155,6 +166,11 @@ from viam.proto.app import (
     UploadModuleFileRequest,
     Visibility,
 )
+from viam.proto.app import Fragment as FragmentPB
+from viam.proto.app import FragmentHistoryEntry as FragmentHistoryEntryPB
+from viam.proto.app import FragmentVisibility as FragmentVisibilityPB
+from viam.proto.app import RobotPart as RobotPartPB
+from viam.proto.app import RobotPartHistoryEntry as RobotPartHistoryEntryPB
 from viam.proto.app.packages import PackageType
 from viam.proto.common import LogEntry as LogEntryPB
 from viam.utils import datetime_to_timestamp, dict_to_struct, struct_to_dict
@@ -193,6 +209,7 @@ class RobotPart:
         self.local_fqdn = robot_part.local_fqdn
         self.created_on = robot_part.created_on.ToDatetime() if robot_part.HasField("created_on") else None
         self.secrets = list(robot_part.secrets)
+        self.last_updated = robot_part.last_updated.ToDatetime() if robot_part.HasField("last_updated") else None
         return self
 
     id: str
@@ -209,6 +226,7 @@ class RobotPart:
     local_fqdn: str
     created_on: Optional[datetime]
     secrets: Optional[List[SharedSecret]]
+    last_updated: Optional[datetime]
 
     @property
     def proto(self) -> RobotPartPB:
@@ -227,6 +245,7 @@ class RobotPart:
             local_fqdn=self.local_fqdn,
             created_on=datetime_to_timestamp(self.created_on) if self.created_on else None,
             secrets=self.secrets,
+            last_updated=datetime_to_timestamp(self.last_updated) if self.last_updated else None,
         )
 
 
@@ -352,6 +371,7 @@ class Fragment:
         self.organization_count = fragment.organization_count
         self.only_used_by_owner = fragment.only_used_by_owner
         self.visibility = Fragment.Visibility.from_proto(fragment.visibility)
+        self.last_updated = fragment.last_updated.ToDatetime() if fragment.HasField("last_updated") else None
         return self
 
     id: str
@@ -365,6 +385,7 @@ class Fragment:
     organization_count: int
     only_used_by_owner: bool
     visibility: Visibility
+    last_updated: Optional[datetime]
 
     @property
     def proto(self) -> FragmentPB:
@@ -380,6 +401,45 @@ class Fragment:
             organization_count=self.organization_count,
             only_used_by_owner=self.only_used_by_owner,
             visibility=self.visibility.to_proto(),
+            last_updated=datetime_to_timestamp(self.last_updated) if self.last_updated else None,
+        )
+
+
+class FragmentHistoryEntry:
+    """A class that mirrors the `FragmentHistoryEntry` proto message.
+
+    Use this class to make the attributes of a `viam.proto.app.FragmentHistoryEntry` more accessible and easier to read/interpret.
+    """
+
+    @classmethod
+    def from_proto(cls, fragment_history_entry: FragmentHistoryEntryPB) -> Self:
+        """Create a `FragmentHistoryEntry` from the .proto defined `FragmentHistoryEntry`.
+
+        Args:
+            fragment_history_entry (viam.proto.app.FragmentHistoryEntry): The object to copy from.
+
+        Returns:
+            FragmentHistoryEntry: The `FragmentHistoryEntry`.
+        """
+        self = cls()
+        self.fragment = fragment_history_entry.fragment
+        self.edited_on = fragment_history_entry.edited_on.ToDatetime()
+        self.old = Fragment.from_proto(fragment_history_entry.old)
+        self.edited_by = fragment_history_entry.edited_by
+        return self
+
+    fragment: str
+    edited_on: datetime
+    old: Fragment
+    edited_by: AuthenticatorInfo
+
+    @property
+    def proto(self) -> FragmentHistoryEntryPB:
+        return FragmentHistoryEntryPB(
+            fragment=self.fragment,
+            edited_on=datetime_to_timestamp(self.edited_on),
+            edited_by=self.edited_by,
+            old=self.old.proto if self.old else None,
         )
 
 
@@ -470,34 +530,29 @@ class AppClient:
         async def main():
 
             # Make a ViamClient
-            viam_client = await connect()
-            # Instantiate an AppClient called "cloud" to run cloud app API methods on
-            cloud = viam_client.app_client
-
-            viam_client.close()
+            async with await connect() as viam_client:
+                # Instantiate an AppClient called "cloud" to run cloud app API methods on
+                cloud = viam_client.app_client
 
         if __name__ == '__main__':
             asyncio.run(main())
 
-    For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+    For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/>`_.
     """
 
-    def __init__(self, channel: Channel, metadata: Mapping[str, str], location_id: Optional[str] = None):
+    def __init__(self, channel: Channel, metadata: Mapping[str, str]):
         """Create an `AppClient` that maintains a connection to app.
 
         Args:
             channel (grpclib.client.Channel): connection to app.
             metadata (Mapping[str, str]): Required authorization token to send requests to app.
-            location_id (Optional[str]): Default location ID.
         """
         self._metadata = metadata
         self._app_client = AppServiceStub(channel)
-        self._location_id = location_id
         self._channel = channel
 
     _app_client: AppServiceStub
     _metadata: Mapping[str, str]
-    _location_id: Optional[str]
     _channel: Channel
     _organization_id: Optional[str] = None
 
@@ -544,7 +599,7 @@ class AppClient:
         Returns:
             str: The ID of the user.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getuseridbyemail>`_.
         """
         request = GetUserIDByEmailRequest(email=email)
         response: GetUserIDByEmailResponse = await self._app_client.GetUserIDByEmail(request, metadata=self._metadata)
@@ -563,7 +618,7 @@ class AppClient:
         Returns:
             Organization: The created organization.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#createorganization>`_.
         """
         request = CreateOrganizationRequest(name=name)
         response: CreateOrganizationResponse = await self._app_client.CreateOrganization(request, metadata=self._metadata)
@@ -579,7 +634,7 @@ class AppClient:
         Returns:
             List[viam.proto.app.Organization]: The list of organizations.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#listorganizations>`_.
         """
         request = ListOrganizationsRequest()
         response: ListOrganizationsResponse = await self._app_client.ListOrganizations(request, metadata=self._metadata)
@@ -590,7 +645,7 @@ class AppClient:
 
         ::
 
-            org_list = await cloud.get_organization_with_access_to_location("location-id")
+            org_list = await cloud.get_organizations_with_access_to_location("location-id")
 
         Args:
             location_id (str): The ID of the location.
@@ -598,7 +653,7 @@ class AppClient:
         Returns:
             List[viam.proto.app.OrganizationIdentity]: The list of organizations.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getorganizationswithaccesstolocation>`_.
         """
         request = GetOrganizationsWithAccessToLocationRequest(location_id=location_id)
         response: GetOrganizationsWithAccessToLocationResponse = await self._app_client.GetOrganizationsWithAccessToLocation(
@@ -611,25 +666,30 @@ class AppClient:
 
         ::
 
-            org_list = await cloud.list_organizations_by_user("user-id")
+            org_list = await cloud.list_organizations_by_user("<YOUR-USER-ID>")
 
         Args:
-            user_id (str): The ID of the user
+            user_id (str): The ID of the user. You can retrieve this with the get_user_id_by_email() method.
 
         Returns:
             List[OrgDetails]: The list of organizations.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#listorganizationsbyuser>`_.
         """
         request = ListOrganizationsByUserRequest(user_id=user_id)
         response: ListOrganizationsByUserResponse = await self._app_client.ListOrganizationsByUser(request, metadata=self._metadata)
         return list(response.orgs)
 
     async def get_organization(self, org_id: str) -> Organization:
-        """Return details about the requested organization.
+        """Retrieve the organization object for the requested organization containing the organization's ID,
+        name, public namespace, and more.
+
+        ::
+
+            org = await cloud.get_organization("<YOUR-ORG-ID>")
 
         Args:
-            org_id (str): The ID of the organization to query.
+            org_id (str): The ID of the organization to query. You can retrieve this from the organization settings page.
 
         Raises:
             GRPCError: If the provided org_id is invalid, or not currently authed to.
@@ -637,7 +697,7 @@ class AppClient:
         Returns:
             viam.proto.app.Organization: The requested organization.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getorganization>`_.
         """
         request = GetOrganizationRequest(organization_id=org_id)
         response: GetOrganizationResponse = await self._app_client.GetOrganization(request, metadata=self._metadata)
@@ -652,7 +712,7 @@ class AppClient:
                 public_namespace="my-cool-organization")
 
         Args:
-            public_namespace (str): Organization namespace to check. Namespaces can only contain lowercase lowercase alphanumeric and dash
+            public_namespace (str): Organization namespace to check. Namespaces can only contain lowercase alphanumeric and dash
                 characters.
 
         Raises:
@@ -661,7 +721,7 @@ class AppClient:
         Returns:
             bool: True if the provided namespace is available.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getorganizationnamespaceavailability>`_.
         """
         request = GetOrganizationNamespaceAvailabilityRequest(public_namespace=public_namespace)
         response: GetOrganizationNamespaceAvailabilityResponse = await self._app_client.GetOrganizationNamespaceAvailability(
@@ -679,6 +739,14 @@ class AppClient:
     ) -> Organization:
         """Updates organization details.
 
+        ::
+
+            organization = await cloud.update_organization(
+                org_id="<YOUR-ORG-ID>",
+                name="Artoo's Org",
+                public_namespace="artoo"
+            )
+
         Args:
             org_id (str): The ID of the organization to update.
             name (Optional[str]): If provided, updates the org's name.
@@ -692,7 +760,7 @@ class AppClient:
         Returns:
             viam.proto.app.Organization: The updated organization.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#updateorganization>`_.
         """
         request = UpdateOrganizationRequest(
             organization_id=org_id,
@@ -708,13 +776,14 @@ class AppClient:
         """Delete an organization
 
         ::
-            await cloud.delete_organization("org-id")
+
+            await cloud.delete_organization("<YOUR-ORG-ID>")
 
         Args:
             org_id (str): The ID of the organization.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#deleteorganization>`_.
         """
         request = DeleteOrganizationRequest(organization_id=org_id)
         await self._app_client.DeleteOrganization(request, metadata=self._metadata)
@@ -724,17 +793,17 @@ class AppClient:
 
         ::
 
-            member_list, invite_list = await cloud.list_organization_members("org-id")
+            member_list, invite_list = await cloud.list_organization_members("<YOUR-ORG-ID>")
 
         Args:
             org_id (str): The ID of the organization to list members of.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
 
         Returns:
             Tuple[List[viam.proto.app.OrganizationMember], List[viam.proto.app.OrganizationInvite]]: A tuple containing two lists; the first
             [0] of organization members, and the second [1] of organization invites.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#listorganizationmembers>`_.
         """
         request = ListOrganizationMembersRequest(organization_id=org_id)
         response: ListOrganizationMembersResponse = await self._app_client.ListOrganizationMembers(request, metadata=self._metadata)
@@ -751,11 +820,11 @@ class AppClient:
 
         ::
 
-            await cloud.create_organization_invite("org-id", "youremail@email.com")
+            await cloud.create_organization_invite("<YOUR-ORG-ID>", "youremail@email.com")
 
         Args:
             org_id (str): The ID of the organization to create an invite for.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             email (str): The email address to send the invite to.
             authorizations (Optional[List[viam.proto.app.Authorization]]): Specifications of the
                 authorizations to include in the invite. If not provided, full owner permissions will
@@ -771,7 +840,7 @@ class AppClient:
         Returns:
             OrganizationInvite: The organization invite.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#createorganizationinvite>`_.
         """
         request = CreateOrganizationInviteRequest(
             organization_id=org_id, email=email, authorizations=authorizations, send_email_invite=send_email_invite
@@ -795,24 +864,25 @@ class AppClient:
 
             from viam.proto.app import Authorization
 
-            authorization_to_add = Authorization(
-                authorization_type="some type of auth",
-                authorization_id="identifier",
-                resource_type="abc",
-                resource_id="resource-identifier123",
-                identity_id="id12345",
-                organization_id="org_id_123"
+            auth = Authorization(
+                authorization_type="role",
+                authorization_id="location_owner",
+                resource_type="location", # "robot", "location", or "organization"
+                resource_id="012456lni0", # machine id, location id or org id
+                identity_id="",
+                organization_id="<YOUR-ORG-ID>",
+                identity_type=""
             )
 
             update_invite = await cloud.update_organization_invite_authorizations(
-                org_id="org_id_123",
+                org_id="<YOUR-ORG-ID>",
                 email="notarealemail@viam.com",
-                add_authorizations =[authorization_to_add]
+                add_authorizations=[auth]
             )
 
         Args:
             org_id (str): The ID of the organization that the invite is for.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             email (str): Email of the user the invite was sent to.
             add_authorizations (Optional[List[viam.proto.app.Authorization]]): Optional list of authorizations to add to the invite.
             remove_authorizations (Optional[List[viam.proto.app.Authorization]]): Optional list of authorizations to remove from the invite.
@@ -824,7 +894,7 @@ class AppClient:
         Returns:
             viam.proto.app.OrganizationInvite: The updated invite.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#updateorganizationinviteauthorizations>`_.
         """
         request = UpdateOrganizationInviteAuthorizationsRequest(
             organization_id=org_id, email=email, add_authorizations=add_authorizations, remove_authorizations=remove_authorizations
@@ -839,17 +909,17 @@ class AppClient:
 
         ::
 
-            member_list, invite_list = await cloud.list_organization_members()
+            member_list, invite_list = await cloud.list_organization_members(org_id="<YOUR-ORG-ID>")
             first_user_id = member_list[0].user_id
 
             await cloud.delete_organization_member(org_id="org_id", user_id=first_user_id)
 
         Args:
             org_id (str): The ID of the org to remove the user from.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             user_id (str): The ID of the user to remove.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#deleteorganizationmember>`_.
         """
         request = DeleteOrganizationMemberRequest(organization_id=org_id, user_id=user_id)
         await self._app_client.DeleteOrganizationMember(request, metadata=self._metadata)
@@ -859,17 +929,17 @@ class AppClient:
 
         ::
 
-            await cloud.delete_organization_invite("org-id", "youremail@email.com")
+            await cloud.delete_organization_invite("<YOUR-ORG-ID>", "youremail@email.com")
 
         Args:
             org_id (str): The ID of the organization that the invite to delete was for.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             email (str): The email address the pending invite was sent to.
 
         Raises:
             GRPCError: If no pending invite is associated with the provided email address.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#deleteorganizationinvite>`_.
         """
         request = DeleteOrganizationInviteRequest(organization_id=org_id, email=email)
         await self._app_client.DeleteOrganizationInvite(request, metadata=self._metadata)
@@ -879,11 +949,11 @@ class AppClient:
 
         ::
 
-            org_invite = await cloud.resend_organization_invite("org-id", "youremail@email.com")
+            org_invite = await cloud.resend_organization_invite("<YOUR-ORG-ID>", "youremail@email.com")
 
         Args:
             org_id (str): The ID of the organization that the invite to resend was for.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             email (str): The email address associated with the invite.
 
         Raises:
@@ -892,7 +962,7 @@ class AppClient:
         Returns:
             viam.proto.app.OrganizationInvite: The organization invite sent.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#resendorganizationinvite>`_.
         """
         request = ResendOrganizationInviteRequest(organization_id=org_id, email=email)
         response: ResendOrganizationInviteResponse = await self._app_client.ResendOrganizationInvite(request, metadata=self._metadata)
@@ -903,11 +973,11 @@ class AppClient:
 
         ::
 
-            my_new_location = await cloud.create_location(org_id="org-id", name="Robotville", parent_location_id="111ab12345")
+            my_new_location = await cloud.create_location(org_id="<YOUR-ORG-ID>", name="Robotville", parent_location_id="111ab12345")
 
         Args:
             org_id (str): The ID of the organization to create the location under.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             name (str): Name of the location.
             parent_location_id (Optional[str]): Optional parent location to put the location under. Defaults to a root-level location if no
                 location ID is provided.
@@ -918,7 +988,7 @@ class AppClient:
         Returns:
             viam.proto.app.Location: The newly created location.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#createlocation>`_.
         """
         request = CreateLocationRequest(organization_id=org_id, name=name, parent_location_id=parent_location_id)
         response: CreateLocationResponse = await self._app_client.CreateLocation(request, metadata=self._metadata)
@@ -941,9 +1011,9 @@ class AppClient:
         Returns:
             viam.proto.app.Location: The location.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getlocation>`_.
         """
-        request = GetLocationRequest(location_id=location_id if location_id else self._location_id if self._location_id else "")
+        request = GetLocationRequest(location_id=location_id if location_id else "")
         response: GetLocationResponse = await self._app_client.GetLocation(request, metadata=self._metadata)
         return response.location
 
@@ -986,7 +1056,7 @@ class AppClient:
         Returns:
             viam.proto.app.Location: The newly updated location.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#updatelocation>`_.
         """
         request = UpdateLocationRequest(location_id=location_id, name=name, parent_location_id=parent_location_id)
         response: UpdateLocationResponse = await self._app_client.UpdateLocation(request, metadata=self._metadata)
@@ -1005,7 +1075,7 @@ class AppClient:
         Raises:
             GRPCError: If an invalid location ID is passed.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#deletelocation>`_.
         """
         request = DeleteLocationRequest(location_id=location_id)
         await self._app_client.DeleteLocation(request, metadata=self._metadata)
@@ -1015,16 +1085,16 @@ class AppClient:
 
         ::
 
-            locations = await cloud.list_locations("org-id")
+            locations = await cloud.list_locations("<YOUR-ORG-ID>")
 
         Args:
             org_id (str): The ID of the org to list locations for.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
 
         Returns:
             List[viam.proto.app.Location]: The list of locations.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#listlocations>`_.
         """
         request = ListLocationsRequest(organization_id=org_id)
         response: ListLocationsResponse = await self._app_client.ListLocations(request, metadata=self._metadata)
@@ -1035,13 +1105,13 @@ class AppClient:
 
         ::
 
-            await cloud.share_location("organization-id", "location-id")
+            await cloud.share_location("<YOUR-ORG-ID>", "<YOUR-LOCATION-ID>")
 
         Args:
             organization_id (str): The ID of the organization.
             location_id (str): The ID of the location.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#sharelocation>`_.
         """
         request = ShareLocationRequest(location_id=location_id, organization_id=organization_id)
         await self._app_client.ShareLocation(request, metadata=self._metadata)
@@ -1051,13 +1121,13 @@ class AppClient:
 
         ::
 
-            await cloud.unshare_location("organization-id", "location-id")
+            await cloud.unshare_location("<YOUR-ORG-ID>", "<YOUR-LOCATION-ID>")
 
         Args:
             organization_id (str): The ID of the organization.
             location_id (str): The ID of the location.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#unsharelocation>`_.
         """
         request = UnshareLocationRequest(location_id=location_id, organization_id=organization_id)
         await self._app_client.UnshareLocation(request, metadata=self._metadata)
@@ -1080,9 +1150,9 @@ class AppClient:
         Returns:
             viam.proto.app.LocationAuth: The `LocationAuth` containing location secrets.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#locationauth>`_.
         """
-        request = LocationAuthRequest(location_id=location_id if location_id else self._location_id if self._location_id else "")
+        request = LocationAuthRequest(location_id=location_id if location_id else "")
         response: LocationAuthResponse = await self._app_client.LocationAuth(request, metadata=self._metadata)
         return response.auth
 
@@ -1091,7 +1161,7 @@ class AppClient:
 
         ::
 
-            new_loc_auth = await cloud.create_location_secret()
+            new_loc_auth = await cloud.create_location_secret(location_id="123xy12345")
 
         Args:
             location_id (Optional[str]): ID of the location to generate a new secret for. Defaults to the location ID provided at
@@ -1104,9 +1174,9 @@ class AppClient:
         Returns:
             viam.proto.app.LocationAuth: The specified location's `LocationAuth` containing the newly created secret.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#createlocationsecret>`_.
         """
-        request = CreateLocationSecretRequest(location_id=location_id if location_id else self._location_id if self._location_id else "")
+        request = CreateLocationSecretRequest(location_id=location_id if location_id else "")
         response: CreateLocationSecretResponse = await self._app_client.CreateLocationSecret(request, metadata=self._metadata)
         return response.auth
 
@@ -1116,7 +1186,9 @@ class AppClient:
         ::
 
             await cloud.delete_location_secret(
-                secret_id="abcd123-456-7890ab-cxyz98-989898xyzxyz")
+                secret_id="abcd123-456-7890ab-cxyz98-989898xyzxyz",
+                location_id="123xy12345"
+            )
 
         Args:
             location_id (str): ID of the location to delete secret from. Defaults to the location ID provided at `AppClient` instantiation.
@@ -1126,30 +1198,28 @@ class AppClient:
             GRPCError: If either an invalid location ID or secret ID is passed or a location ID isn't passed and there was no location
                 ID provided at `AppClient` instantiation.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#deletelocationsecret>`_.
         """
-        request = DeleteLocationSecretRequest(
-            location_id=location_id if location_id else self._location_id if self._location_id else "", secret_id=secret_id
-        )
+        request = DeleteLocationSecretRequest(location_id=location_id if location_id else "", secret_id=secret_id)
         await self._app_client.DeleteLocationSecret(request, metadata=self._metadata)
 
     async def get_robot(self, robot_id: str) -> Robot:
-        """Get a robot.
+        """Get a machine.
 
         ::
 
-            robot = await cloud.get_robot(robot_id="1a123456-x1yz-0ab0-a12xyzabc")
+            machine = await cloud.get_robot(robot_id="1a123456-x1yz-0ab0-a12xyzabc")
 
         Args:
-            robot_id (str): ID of the robot to get.
+            robot_id (str): ID of the machine to get. You can copy this value from the URL of the machine's page.
 
         Raises:
-            GRPCError: If an invalid robot ID is passed.
+            GRPCError: If an invalid machine ID is passed.
 
         Returns:
-            viam.proto.app.Robot: The robot.
+            viam.proto.app.Robot: The machine.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getrobot>`_.
         """
         request = GetRobotRequest(id=robot_id)
         response: GetRobotResponse = await self._app_client.GetRobot(request, metadata=self._metadata)
@@ -1164,60 +1234,70 @@ class AppClient:
 
         Args:
             org_id (str): The ID of the organization to list rover rental robots for.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
 
         Returns:
             List[viam.proto.app.RoverRentalRobot]: The list of rover rental robots.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/>`_.
         """
         request = GetRoverRentalRobotsRequest(org_id=org_id)
         response: GetRoverRentalRobotsResponse = await self._app_client.GetRoverRentalRobots(request, metadata=self._metadata)
         return list(response.robots)
 
     async def get_robot_parts(self, robot_id: str) -> List[RobotPart]:
-        """Get a list of all the parts under a specific robot.
+        """Get a list of all the parts under a specific machine.
 
         ::
 
             list_of_parts = await cloud.get_robot_parts(
-                robot_id="1a123456-x1yz-0ab0-a12xyzabc")
+                robot_id="1a123456-x1yz-0ab0-a12xyzabc"
+            )
 
         Args:
-            robot_id (str): ID of the robot to get parts from.
+            robot_id (str): ID of the machine to get parts from.
 
         Raises:
-            GRPCError: If an invalid robot ID is passed.
+            GRPCError: If an invalid machine ID is passed.
 
         Returns:
-            List[viam.app.app_client.RobotPart]: The list of robot parts.
+            List[viam.app.app_client.RobotPart]: The list of machine parts.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getrobotparts>`_.
         """
         request = GetRobotPartsRequest(robot_id=robot_id)
         response: GetRobotPartsResponse = await self._app_client.GetRobotParts(request, metadata=self._metadata)
         return [RobotPart.from_proto(robot_part=part) for part in response.parts]
 
     async def get_robot_part(self, robot_part_id: str, dest: Optional[str] = None, indent: int = 4) -> RobotPart:
-        """Get a robot part.
+        """Get a machine part including its part config, part address, and other information.
 
         ::
 
             my_robot_part = await cloud.get_robot_part(
-                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22")
-
-        Args:
-            robot_part_id (str): ID of the robot part to get.
-            dest (Optional[str]): Optional filepath to write the robot part's config file in JSON format to.
+                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22"
+            )
+            # Get the part's config
+            machine_part_config = my_robot_part.robot_config
+            # Get the part's address
+            address = my_robot_part.fqdn
+            # Check if machine is live (last access time less than 10 sec ago)
+            if (time.time() - my_robot_part.last_access.timestamp()) <= 10000:
+                print("Machine is live.")
+
+        Args:
+            robot_part_id (str): ID of the machine part to get. You can retrieve this value by navigating to the machine's page,
+                clicking on the part status dropdown, and clicking the copy icon next to Part ID.
+            dest (Optional[str]): Optional filepath to write the machine part's config file in JSON format to.
             indent (int): Size (in number of spaces) of indent when writing config to `dest`. Defaults to 4.
 
         Raises:
-            GRPCError: If an invalid robot part ID is passed.
+            GRPCError: If an invalid machine part ID is passed.
 
         Returns:
-            viam.app.app_client.RobotPart: The robot part.
+            viam.app.app_client.RobotPart: The machine part.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getrobotpart>`_.
         """
         request = GetRobotPartRequest(id=robot_part_id)
         response: GetRobotPartResponse = await self._app_client.GetRobotPart(request, metadata=self._metadata)
@@ -1245,10 +1325,12 @@ class AppClient:
         ::
 
             part_logs = await cloud.get_robot_part_logs(
-                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22", num_log_entries=20)
+                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22",
+                num_log_entries=20
+            )
 
         Args:
-            robot_part_id (str): ID of the robot part to get logs from.
+            robot_part_id (str): ID of the machine part to get logs from.
             filter (Optional[str]): Only include logs with messages that contain the string `filter`. Defaults to empty string "" (that is,
                 no filter).
             dest (Optional[str]): Optional filepath to write the log entries to.
@@ -1262,7 +1344,7 @@ class AppClient:
         Returns:
             List[viam.app.app_client.LogEntry]: The list of log entries.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getrobotpartlogs>`_.
         """
         if num_log_entries < 0:
             raise ValueError("'num_log_entries must be at least 0.")
@@ -1309,21 +1391,22 @@ class AppClient:
     async def tail_robot_part_logs(
         self, robot_part_id: str, errors_only: bool = True, filter: Optional[str] = None
     ) -> _LogsStream[List[LogEntry]]:
-        """Get an asynchronous iterator that receives live robot part logs.
+        """Get an asynchronous iterator that receives live machine part logs.
 
         ::
 
             logs_stream = await cloud.tail_robot_part_logs(
-                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22")
+                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22"
+            )
 
         Args:
-            robot_part_id (str): ID of the robot part to retrieve logs from.
+            robot_part_id (str): ID of the machine part to retrieve logs from.
             errors_only (bool): Boolean specifying whether or not to only include error logs. Defaults to True.
             filter (Optional[str]): Only include logs with messages that contain the string `filter`. Defaults to empty string "" (that is,
                 no filter).
 
         Returns:
-            _LogsStream[List[LogEntry]]: The asynchronous iterator receiving live robot part logs.
+            _LogsStream[List[LogEntry]]: The asynchronous iterator receiving live machine part logs.
         """
 
         async def read() -> AsyncIterator[List[LogEntry]]:
@@ -1342,118 +1425,131 @@ class AppClient:
         return _LogsStreamWithIterator(read())
 
     async def get_robot_part_history(self, robot_part_id: str) -> List[RobotPartHistoryEntry]:
-        """Get a list containing the history of a robot part.
+        """Get a list containing the history of a machine part.
 
         ::
 
             part_history = await cloud.get_robot_part_history(
-                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22")
+                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22"
+            )
 
         Args:
-            robot_part_id (str): ID of the robot part to retrieve history from.
+            robot_part_id (str): ID of the machine part to retrieve history from.
 
         Raises:
-            GRPCError: If an invalid robot part ID is provided.
+            GRPCError: If an invalid machine part ID is provided.
 
         Returns:
-            List[viam.app.app_client.RobotPartHistoryEntry]: The list of the robot part's history.
+            List[viam.app.app_client.RobotPartHistoryEntry]: The list of the machine part's history.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getrobotapikeys>`_.
         """
         request = GetRobotPartHistoryRequest(id=robot_part_id)
         response: GetRobotPartHistoryResponse = await self._app_client.GetRobotPartHistory(request, metadata=self._metadata)
         return [RobotPartHistoryEntry.from_proto(part_history) for part_history in response.history]
 
-    async def update_robot_part(self, robot_part_id: str, name: str, robot_config: Optional[Mapping[str, Any]] = None) -> RobotPart:
-        """Change the name and assign an optional new configuration to a robot part.
+    async def update_robot_part(
+        self, robot_part_id: str, name: str, robot_config: Optional[Mapping[str, Any]] = None, last_known_update: Optional[datetime] = None
+    ) -> RobotPart:
+        """Change the name and assign an optional new configuration to a machine part.
 
         ::
 
-            my_robot_part = await cloud.update_robot_part(
-                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22")
+            my_machine_part = await cloud.update_robot_part(
+                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22"
+            )
 
         Args:
             robot_part_id (str): ID of the robot part to update.
             name (str): New name to be updated on the robot part.
-            robot_config (Mapping[str, Any]): Optional new config represented as a dictionary to be updated on the robot part. The robot
+            robot_config (Mapping[str, Any]): Optional new config represented as a dictionary to be updated on the machine part. The machine
                 part's config will remain as is (no change) if one isn't passed.
-
+            last_known_update (datetime): Optional time of the last known update to this part's config. If provided, this will result in a
+                GRPCError if the upstream config has changed since this time, indicating that the local config is out of date. Omitting this
+                parameter will result in an overwrite of the upstream config.
         Raises:
-            GRPCError: If either an invalid robot part ID, name, or config is passed.
-
+            GRPCError: If either an invalid machine part ID, name, or config is passed, or if the upstream config has changed since
+                last_known_update.
         Returns:
             viam.app.app_client.RobotPart: The newly updated robot part.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#updaterobotpart>`_.
         """
-        request = UpdateRobotPartRequest(id=robot_part_id, name=name, robot_config=dict_to_struct(robot_config) if robot_config else None)
+        request = UpdateRobotPartRequest(
+            id=robot_part_id,
+            name=name,
+            robot_config=dict_to_struct(robot_config) if robot_config else None,
+            last_known_update=datetime_to_timestamp(last_known_update),
+        )
         response: UpdateRobotPartResponse = await self._app_client.UpdateRobotPart(request, metadata=self._metadata)
         return RobotPart.from_proto(robot_part=response.part)
 
     async def new_robot_part(self, robot_id: str, part_name: str) -> str:
-        """Create a new robot part.
+        """Create a new machine part.
 
         ::
 
             new_part_id = await cloud.new_robot_part(
-                robot_id="1a123456-x1yz-0ab0-a12xyzabc", part_name="myNewSubPart")
+                robot_id="1a123456-x1yz-0ab0-a12xyzabc", part_name="myNewSubPart"
+            )
 
         Args:
-            robot_id (str): ID of the the robot to create a new part for.
+            robot_id (str): ID of the machine to create a new part for.
             part_name (str): Name of the new part.
 
         Raises:
-            GRPCError: If either an invalid robot ID or name is passed.
+            GRPCError: If either an invalid machine ID or name is passed.
 
         Returns:
-            str: The new robot part's ID.
+            str: The new machine part's ID.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#newrobotpart>`_.
         """
         request = NewRobotPartRequest(robot_id=robot_id, part_name=part_name)
         response: NewRobotPartResponse = await self._app_client.NewRobotPart(request, metadata=self._metadata)
         return response.part_id
 
     async def delete_robot_part(self, robot_part_id: str) -> None:
-        """Delete the specified robot part.
+        """Delete the specified machine part.
 
         ::
 
             await cloud.delete_robot_part(
-                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22")
+                robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22"
+            )
 
         Args:
-            robot_part_id (str): ID of the robot part to delete. Must be specified.
+            robot_part_id (str): ID of the machine part to delete. Must be specified.
 
         Raises:
-            GRPCError: If an invalid robot part ID is passed.
+            GRPCError: If an invalid machine part ID is passed.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#deleterobotpart>`_.
         """
         request = DeleteRobotPartRequest(part_id=robot_part_id)
         await self._app_client.DeleteRobotPart(request, metadata=self._metadata)
 
     async def get_robot_api_keys(self, robot_id: str) -> List[APIKeyWithAuthorizations]:
-        """Gets the Robot API Keys for the robot.
+        """Gets the API Keys for the machine.
 
         ::
 
-            await cloud.get_robot_api_keys(robot_id="robot-id")
+            api_keys = await cloud.get_robot_api_keys(robot_id="robot-id")
 
         Args:
-            robot_id (str): The ID of the robot
+            robot_id (str): The ID of the machine.
 
         Returns:
             List[APIKeyWithAuthorizations]: The list of API keys.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getrobotapikeys>`_.
         """
         request = GetRobotAPIKeysRequest(robot_id=robot_id)
         response: GetRobotAPIKeysResponse = await self._app_client.GetRobotAPIKeys(request, metadata=self._metadata)
         return list(response.api_keys)
 
     async def mark_part_as_main(self, robot_part_id: str) -> None:
-        """Mark a robot part as the main part of a robot.
+        """Mark a machine part as the main part of a machine.
 
         ::
 
@@ -1461,18 +1557,18 @@ class AppClient:
                 robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22")
 
         Args:
-            robot_part_id (str): ID of the robot part to mark as main.
+            robot_part_id (str): ID of the machine part to mark as main.
 
         Raises:
-            GRPCError: If an invalid robot part ID is passed.
+            GRPCError: If an invalid machine part ID is passed.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#markpartasmain>`_.
         """
         request = MarkPartAsMainRequest(part_id=robot_part_id)
         await self._app_client.MarkPartAsMain(request, metadata=self._metadata)
 
     async def mark_part_for_restart(self, robot_part_id: str) -> None:
-        """Mark the specified robot part for restart.
+        """Mark the specified machine part for restart.
 
         ::
 
@@ -1480,18 +1576,18 @@ class AppClient:
                 robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22")
 
         Args:
-            robot_part_id (str): ID of the robot part to mark for restart.
+            robot_part_id (str): ID of the machine part to mark for restart.
 
         Raises:
-            GRPCError: If an invalid robot part ID is passed.
+            GRPCError: If an invalid machine part ID is passed.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#markpartforrestart>`_.
         """
         request = MarkPartForRestartRequest(part_id=robot_part_id)
         await self._app_client.MarkPartForRestart(request, metadata=self._metadata)
 
     async def create_robot_part_secret(self, robot_part_id: str) -> RobotPart:
-        """Create a robot part secret.
+        """Create a machine part secret.
 
         ::
 
@@ -1499,22 +1595,22 @@ class AppClient:
                 robot_part_id="abc12345-1a23-1234-ab12-a22a22a2aa22")
 
         Args:
-            robot_part_id (str): ID of the robot part to create a secret for.
+            robot_part_id (str): ID of the machine part to create a secret for.
 
         Raises:
-            GRPCError: If an invalid robot part ID is passed.
+            GRPCError: If an invalid machine part ID is passed.
 
         Returns:
-            viam.app.app_client.RobotPart: The robot part the new secret was generated for.
+            viam.app.app_client.RobotPart: The machine part the new secret was generated for.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#createrobotpartsecret>`_.
         """
         request = CreateRobotPartSecretRequest(part_id=robot_part_id)
         response: CreateRobotPartSecretResponse = await self._app_client.CreateRobotPartSecret(request, metadata=self._metadata)
         return RobotPart.from_proto(response.part)
 
     async def delete_robot_part_secret(self, robot_part_id: str, secret_id: str) -> None:
-        """Delete a robot part secret.
+        """Delete a machine part secret.
 
         ::
 
@@ -1523,26 +1619,26 @@ class AppClient:
                 secret_id="123xyz12-abcd-4321-12ab-12xy1xyz12xy")
 
         Args:
-            robot_part_id (str): ID of the robot part to delete the secret from.
+            robot_part_id (str): ID of the machine part to delete the secret from.
             secret_id (str): ID of the secret to delete.
 
         Raises:
-            GRPCError: If an invalid robot part ID or secret ID is passed.
+            GRPCError: If an invalid machine part ID or secret ID is passed.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <hhttps://docs.viam.com/dev/reference/apis/fleet/#deleterobotpartsecret>`_.
         """
         request = DeleteRobotPartSecretRequest(part_id=robot_part_id, secret_id=secret_id)
         await self._app_client.DeleteRobotPartSecret(request, metadata=self._metadata)
 
     async def list_robots(self, location_id: Optional[str] = None) -> List[Robot]:
-        """Get a list of all robots under the specified location.
+        """Get a list of all machines under the specified location.
 
         ::
 
             list_of_machines = await cloud.list_robots(location_id="123ab12345")
 
         Args:
-            location_id (Optional[str]): ID of the location to retrieve the robots from. Defaults to the location ID provided at
+            location_id (Optional[str]): ID of the location to retrieve the machines from. Defaults to the location ID provided at
                 `AppClient` instantiation.
 
         Raises:
@@ -1552,22 +1648,22 @@ class AppClient:
         Returns:
             List[viam.proto.app.Robot]: The list of robots.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#listrobots>`_.
         """
-        request = ListRobotsRequest(location_id=location_id if location_id else self._location_id if self._location_id else "")
+        request = ListRobotsRequest(location_id=location_id if location_id else "")
         response: ListRobotsResponse = await self._app_client.ListRobots(request, metadata=self._metadata)
         return list(response.robots)
 
     async def new_robot(self, name: str, location_id: Optional[str] = None) -> str:
-        """Create a new robot.
+        """Create a new machine.
 
         ::
 
-            new_machine_id = await cloud.new_robot(name="beepboop")
+            new_machine_id = await cloud.new_robot(name="beepboop", location_id="my-location-id")
 
         Args:
-            name (str): Name of the new robot.
-            location_id (Optional[str]): ID of the location under which to create the robot. Defaults to the current authorized location.
+            name (str): Name of the new machine.
+            location_id (Optional[str]): ID of the location under which to create the machine. Defaults to the current authorized location.
 
         Raises:
             GRPCError: If an invalid location ID is passed or one isn't passed and there was no location ID provided at `AppClient`
@@ -1576,56 +1672,56 @@ class AppClient:
         Returns:
             str: The new robot's ID.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#newrobot>`_.
         """
-        request = NewRobotRequest(location=location_id if location_id else self._location_id if self._location_id else "", name=name)
+        request = NewRobotRequest(location=location_id if location_id else "", name=name)
         response: NewRobotResponse = await self._app_client.NewRobot(request, metadata=self._metadata)
         return response.id
 
     async def update_robot(self, robot_id: str, name: str, location_id: Optional[str] = None) -> Robot:
-        """Change the name of an existing robot.
+        """Change the name of an existing machine.
 
         ::
 
             updated_robot = await cloud.update_robot(
                 robot_id="1a123456-x1yz-0ab0-a12xyzabc",
-                name="Orange-Robot")
+                name="Orange-Robot",
+                location_id="23ab12345"
+            )
 
         Args:
-            robot_id (str): ID of the robot to update.
-            name (str): New name to be updated on the robot.
-            location_id (Optional[str]): ID of the location under which the robot exists. Defaults to the location ID provided at
+            robot_id (str): ID of the machine to update.
+            name (str): New name to be updated on the machine.
+            location_id (Optional[str]): ID of the location under which the machine exists. Defaults to the location ID provided at
                 `AppClient` instantiation
 
         Raises:
-            GRPCError: If either an invalid robot ID, name, or location ID is passed or a location ID isn't passed and there was no location
-                ID provided at `AppClient` instantiation.
+            GRPCError: If either an invalid machine ID, name, or location ID is passed or a location ID isn't passed and there was no
+                location ID provided at `AppClient` instantiation.
 
         Returns:
-            viam.proto.app.Robot: The newly updated robot.
+            viam.proto.app.Robot: The newly updated machine.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#updaterobot>`_.
         """
-        request = UpdateRobotRequest(
-            id=robot_id, name=name, location=location_id if location_id else self._location_id if self._location_id else ""
-        )
+        request = UpdateRobotRequest(id=robot_id, name=name, location=location_id if location_id else "")
         response: UpdateRobotResponse = await self._app_client.UpdateRobot(request, metadata=self._metadata)
         return response.robot
 
     async def delete_robot(self, robot_id: str) -> None:
-        """Delete the specified robot.
+        """Delete the specified machine.
 
         ::
 
             await cloud.delete_robot(robot_id="1a123456-x1yz-0ab0-a12xyzabc")
 
         Args:
-            robot_id (str): ID of the robot to delete.
+            robot_id (str): ID of the machine to delete.
 
         Raises:
-            GRPCError: If an invalid robot ID is passed.
+            GRPCError: If an invalid machine ID is passed.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#deleterobot>`_.
         """
         request = DeleteRobotRequest(id=robot_id)
         await self._app_client.DeleteRobot(request, metadata=self._metadata)
@@ -1641,9 +1737,9 @@ class AppClient:
 
         Args:
             org_id (str): The ID of the organization to list fragments for.
-                You can obtain your organization ID from the Viam app's organization settings page.
-            show_public (bool): **Deprecated**: Use ``visibilities`` instead. Optional boolean specifying whether or not to only show public
-                fragments. If True, only public fragments will return. If False, only private fragments will return. Defaults to True.
+                You can obtain your organization ID from the organization settings page.
+            show_public (bool): Optional boolean specifying whether or not to only show public fragments. If True, only public fragments
+                will return. If False, only private fragments will return. Defaults to True.
 
                 .. deprecated:: 0.25.0
                     Use ``visibilities`` instead.
@@ -1653,7 +1749,7 @@ class AppClient:
         Returns:
             List[viam.app.app_client.Fragment]: The list of fragments.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#listfragments>`_.
         """
         request = ListFragmentsRequest(
             organization_id=org_id,
@@ -1663,7 +1759,7 @@ class AppClient:
         response: ListFragmentsResponse = await self._app_client.ListFragments(request, metadata=self._metadata)
         return [Fragment.from_proto(fragment=fragment) for fragment in response.fragments]
 
-    async def get_fragment(self, fragment_id: str) -> Fragment:
+    async def get_fragment(self, fragment_id: str, version: Optional[str] = None) -> Fragment:
         """Get a fragment.
 
         ::
@@ -1675,6 +1771,7 @@ class AppClient:
 
         Args:
             fragment_id (str): ID of the fragment to get.
+            version (str): Optional specification of the fragment version to get (revision or tag).
 
         Raises:
             GRPCError: If an invalid fragment ID is passed.
@@ -1682,9 +1779,9 @@ class AppClient:
         Returns:
             viam.app.app_client.Fragment: The fragment.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getfragment>`_.
         """
-        request = GetFragmentRequest(id=fragment_id)
+        request = GetFragmentRequest(id=fragment_id, version=version)
         response: GetFragmentResponse = await self._app_client.GetFragment(request, metadata=self._metadata)
         return Fragment.from_proto(fragment=response.fragment)
 
@@ -1697,7 +1794,7 @@ class AppClient:
 
         Args:
             org_id (str): The ID of the organization to create the fragment within.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             name (str): Name of the fragment.
             config (Optional[Mapping[str, Any]]): Optional Dictionary representation of new config to assign to specified fragment. Can be
                 assigned by updating the fragment.
@@ -1708,7 +1805,7 @@ class AppClient:
         Returns:
             viam.app.app_client.Fragment: The newly created fragment.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#createfragment>`_.
         """
         request = CreateFragmentRequest(name=name, config=dict_to_struct(config) if config else None, organization_id=org_id)
         response: CreateFragmentResponse = await self._app_client.CreateFragment(request, metadata=self._metadata)
@@ -1721,6 +1818,7 @@ class AppClient:
         config: Optional[Mapping[str, Any]] = None,
         public: Optional[bool] = None,
         visibility: Optional[Fragment.Visibility] = None,
+        last_known_update: Optional[datetime] = None,
     ) -> Fragment:
         """Update a fragment name AND its config and/or visibility.
 
@@ -1735,22 +1833,24 @@ class AppClient:
             name (str): New name to associate with the fragment.
             config (Optional[Mapping[str, Any]]): Optional Dictionary representation of new config to assign to specified fragment. Not
                 passing this parameter will leave the fragment's config unchanged.
-            public (bool): **Deprecated**: Use ``visibility`` instead. Boolean specifying whether the fragment is public. Not passing this
-                parameter will leave the fragment's visibility unchanged. A fragment is private by default when created.
+            public (bool): Boolean specifying whether the fragment is public. Not passing this parameter will leave the fragment's
+                visibility unchanged. A fragment is private by default when created.
 
                 .. deprecated:: 0.25.0
                     Use ``visibility`` instead.
             visibility (Optional[FragmentVisibility]): Optional FragmentVisibility list specifying who should be allowed
                 to view the fragment. Not passing this parameter will leave the fragment's visibility unchanged.
                 A fragment is private by default when created.
-
+            last_known_update (datetime): Optional time of the last known update to this fragment's config. If provided, this will result in
+                a GRPCError if the upstream config has changed since this time, indicating that the local config is out of date. Omitting
+                this parameter will result in an overwrite of the upstream config.
         Raises:
-            GRPCError: if an invalid ID, name, or config is passed.
+            GRPCError: if an invalid ID, name, or config is passed, or if the upstream fragment config has changed since last_known_update.
 
         Returns:
             viam.app.app_client.Fragment: The newly updated fragment.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#updatefragment>`_.
         """
         request = UpdateFragmentRequest(
             id=fragment_id,
@@ -1758,6 +1858,7 @@ class AppClient:
             config=dict_to_struct(config) if config else None,
             public=public,
             visibility=visibility.to_proto() if visibility else None,
+            last_known_update=datetime_to_timestamp(last_known_update),
         )
         response: UpdateFragmentResponse = await self._app_client.UpdateFragment(request, metadata=self._metadata)
         return Fragment.from_proto(response.fragment)
@@ -1776,11 +1877,43 @@ class AppClient:
         Raises:
             GRPCError: If an invalid fragment ID is passed.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#deletefragment>`_.
         """
         request = DeleteFragmentRequest(id=fragment_id)
         await self._app_client.DeleteFragment(request, metadata=self._metadata)
 
+    async def get_fragment_history(
+        self, id: str, page_token: Optional[str] = "", page_limit: Optional[int] = 10
+    ) -> List[FragmentHistoryEntry]:
+        """Get fragment history.
+
+        ::
+
+            fragment_history = await cloud.get_fragment_history(
+                id = "12a12ab1-1234-5678-abcd-abcd01234567",
+                page_token = "pg-token",
+                page_limit = 10
+            )
+
+        Args:
+            id (str): ID of the fragment to fetch history for.
+            page_token (Optional[str]): the page token for the fragment history collection
+            page_limit (Optional[int]): the number of fragment history documents to return in the result.
+                The default page limit is 10.
+
+        Raises:
+            GRPCError: if an invalid fragment id, page token or page limit is passed.
+
+        Returns:
+            viam.app.app_client.FragmentHistoryResponse: A list of documents with the fragment history.
+
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getfragmenthistory>`_.
+        """
+
+        request = GetFragmentHistoryRequest(id=id, page_token=page_token, page_limit=page_limit)
+        response: GetFragmentHistoryResponse = await self._app_client.GetFragmentHistory(request, metadata=self._metadata)
+        return [FragmentHistoryEntry.from_proto(fragment_history) for fragment_history in response.history]
+
     async def add_role(
         self,
         org_id: str,
@@ -1794,15 +1927,16 @@ class AppClient:
         ::
 
             await cloud.add_role(
-                org_id="org-id",
+                org_id="<YOUR-ORG-ID>",
                 identity_id="abc01234-0123-4567-ab12-a11a00a2aa22",
                 role="owner",
                 resource_type="location",
-                resource_id="111ab12345")
+                resource_id="111ab12345"
+            )
 
         Args:
             org_id (str): The ID of the organization to create the role in.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             identity_id (str): ID of the entity the role belongs to (for example, a user ID).
             role (Union[Literal["owner"], Literal["operator"]]): The role to add.
             resource_type (Union[Literal["organization"], Literal["location"], Literal["robot"]]): Type of the resource to add role to.
@@ -1812,7 +1946,7 @@ class AppClient:
         Raises:
             GRPCError: If either an invalid identity ID, role ID, resource type, or resource ID is passed.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#addrole>`_.
         """
         authorization = await self._create_authorization(
             organization_id=org_id,
@@ -1838,15 +1972,16 @@ class AppClient:
         ::
 
             await cloud.remove_role(
-                org_id="org-id",
+                org_id="<YOUR-ORG-ID>",
                 identity_id="abc01234-0123-4567-ab12-a11a00a2aa22",
                 role="owner",
                 resource_type="location",
-                resource_id="111ab12345")
+                resource_id="111ab12345"
+            )
 
         Args:
             org_id (str): The ID of the organization the role exists in.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             identity_id (str): ID of the entity the role belongs to (for example, a user ID).
             role (Union[Literal["owner"], Literal["operator"]]): The role to remove.
             resource_type (Union[Literal["organization"], Literal["location"], Literal["robot"]]): Type of the resource the role is being
@@ -1856,7 +1991,7 @@ class AppClient:
         Raises:
             GRPCError: If either an invalid identity ID, role ID, resource type, or resource ID or is passed.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#removerole>`_.
         """
         authorization = await self._create_authorization(
             organization_id=org_id,
@@ -1886,15 +2021,16 @@ class AppClient:
         ::
 
             await cloud.change_role(
-                organization_id="organization-id",
+                organization_id="<YOUR-ORG-ID>",
                 old_identity_id="abc01234-0123-4567-ab12-a11a00a2aa22",
                 old_role="operator",
                 old_resource_type="location",
                 old_resource_id="111ab12345",
                 new_identity_id="abc01234-0123-4567-ab12-a11a00a2aa22",
-                new_role="owner",s
+                new_role="owner",
                 new_resource_type="organization",
-                new_resource_id="abc12345")
+                new_resource_id="abc12345"
+            )
 
         Args:
             organization_id (str): ID of the organization
@@ -1904,13 +2040,13 @@ class AppClient:
                 added to. Must match `old_resource_id`.
             old_resource_id (str): ID of the resource the role applies to (that is, either an organization, location, or robot ID).
 
-            new_identity_id (str): New ID of the entity the role blongs to (for example, a user ID).
+            new_identity_id (str): New ID of the entity the role belongs to (for example, a user ID).
             new_role (Union[Literal["owner"], Literal["operator"]]): The new role.
             new_resource_type (Union[Literal["organization"], Literal["location"], Literal["robot"]]): Type of the resource to add role to.
                 Must match `new_resource_id`.
             new_resource_id (str): New ID of the resource the role applies to (that is, either an organization, location, or robot ID).
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#changerole>`_.
         """
         old_authorization = await self._create_authorization(
             organization_id=organization_id,
@@ -1938,7 +2074,7 @@ class AppClient:
         ::
 
             list_of_auths = await cloud.list_authorizations(
-                org_id="org-id",
+                org_id="<YOUR-ORG-ID>",
                 resource_ids=["1a123456-x1yz-0ab0-a12xyzabc"])
 
         Args:
@@ -1952,7 +2088,7 @@ class AppClient:
         Returns:
             List[viam.proto.app.Authorization]: The list of authorizations.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#listauthorizations>`_.
         """
         request = ListAuthorizationsRequest(organization_id=org_id, resource_ids=resource_ids)
         response: ListAuthorizationsResponse = await self._app_client.ListAuthorizations(request, metadata=self._metadata)
@@ -1968,7 +2104,7 @@ class AppClient:
             # Check whether the entity you're currently authenticated to has permission to control and/or
             # read logs from robots in the "organization-identifier123" org
             permissions = [AuthorizedPermissions(resource_type="organization",
-                                                 resource_id="organization-identifier123",
+                                                 resource_id="<YOUR-ORG-ID>",
                                                  permissions=["control_robot",
                                                               "read_robot_logs"])]
 
@@ -1984,13 +2120,13 @@ class AppClient:
         Returns:
             List[viam.proto.app.AuthorizedPermissions]: The permissions argument, with invalid permissions filtered out.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#checkpermissions>`_.
         """
         request = CheckPermissionsRequest(permissions=permissions)
         response: CheckPermissionsResponse = await self._app_client.CheckPermissions(request, metadata=self._metadata)
         return list(response.authorized_permissions)
 
-    async def get_registry_item(self, item_id: str) -> RegistryItem:
+    async def get_registry_item(self, item_id: str, include_markdown_documentation: bool = False) -> RegistryItem:
         """Get registry item by ID.
 
         ::
@@ -1998,14 +2134,17 @@ class AppClient:
             item = await cloud.get_registry_item("item-id")
 
         Args:
-            item_id (str): The ID of the registry item.
+            item_id (str): The ID of the registry item. This is the namespace and name of the item in the
+                form `namespace:name`. For example, `Viam's csi-cam-pi module's <https://app.viam.com/module/viam/csi-cam-pi>`_ item ID
+                would be `viam:csi-cam-pi`. You can also use `org-id:name`. For example,
+                `abc01234-0123-4567-ab12-a11a00a2aa22:training-script`.
 
         Returns:
             RegistryItem: The registry item.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getregistryitem>`_.
         """
-        request = GetRegistryItemRequest(item_id=item_id)
+        request = GetRegistryItemRequest(item_id=item_id, include_markdown_documentation=include_markdown_documentation)
         response: GetRegistryItemResponse = await self._app_client.GetRegistryItem(request, metadata=self._metadata)
         return response.item
 
@@ -2014,14 +2153,16 @@ class AppClient:
 
         ::
 
-            await cloud.create_registry_item("org-id", "name", PackageType.PACKAGE_TYPE_ML_MODEL)
+            from viam.proto.app.packages import PackageType
+
+            await cloud.create_registry_item("<YOUR-ORG-ID>", "name", PackageType.PACKAGE_TYPE_ML_MODEL)
 
         Args:
             organization_id (str): The organization to create the registry item under.
             name (str): The name of the registry item, which must be unique within your org.
             type (PackageType.ValueType): The type of the item in the registry.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#createregistryitem>`_.
         """
         request = CreateRegistryItemRequest(organization_id=organization_id, name=name, type=type)
         await self._app_client.CreateRegistryItem(request, metadata=self._metadata)
@@ -2033,13 +2174,24 @@ class AppClient:
 
         ::
 
-            await cloud.update_registry_item("item-id", PackageType.PACKAGE_TYPE_ML_TRAINING, "description", Visibility.VISIBILITY_PUBLIC)
+            from viam.proto.app.packages import PackageType
+            from viam.proto.app import Visibility
+
+            await cloud.update_registry_item(
+                "your-namespace:your-name",
+                PackageType.PACKAGE_TYPE_ML_TRAINING,
+                "description",
+                Visibility.VISIBILITY_PUBLIC
+            )
 
         Args:
-            item_id (str): The ID of the registry item.
+            item_id (str): The ID of the registry item, containing either the namespace and module name
+                (for example, `my-org:my-module`) or organization ID and module name (`org-id:my-module`).
             type (PackageType.ValueType): The type of the item in the registry.
             description (str): The description of the registry item.
             visibility (Visibility.ValueType): The visibility of the registry item.
+
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#updateregistryitem>`_.
         """
 
         request = UpdateRegistryItemRequest(item_id=item_id, type=type, description=description, visibility=visibility)
@@ -2057,6 +2209,29 @@ class AppClient:
     ) -> List[RegistryItem]:
         """List the registry items in an organization.
 
+        ::
+
+            from viam.proto.app.packages import PackageType
+            from viam.proto.app import Visibility, RegistryItemStatus
+
+            # List private, published ml training scripts in your organization
+            registry_items = await cloud.list_registry_items(
+                organization_id="<YOUR-ORG-ID>",
+                types=[PackageType.PACKAGE_TYPE_ML_TRAINING],
+                visibilities=[Visibility.VISIBILITY_PRIVATE],
+                platforms=[""],
+                statuses=[RegistryItemStatus.REGISTRY_ITEM_STATUS_PUBLISHED]
+            )
+
+            # List public, published linux modules in all organizations
+            registry_items = await cloud.list_registry_items(
+                organization_id="",
+                types=[PackageType.PACKAGE_TYPE_MODULE],
+                visibilities=[Visibility.VISIBILITY_PUBLIC],
+                platforms=["linux/any"],
+                statuses=[RegistryItemStatus.REGISTRY_ITEM_STATUS_PUBLISHED]
+            )
+
         Args:
             organization_id (str): The ID of the organization to return registry items for.
             types (List[PackageType.ValueType]): The types of registry items.
@@ -2069,7 +2244,7 @@ class AppClient:
         Returns:
             List[RegistryItem]: The list of registry items.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#listregistryitems>`_.
         """
         request = ListRegistryItemsRequest(
             organization_id=organization_id,
@@ -2088,12 +2263,13 @@ class AppClient:
 
         ::
 
-            await cloud.delete_registry_item("item-id")
+            await cloud.delete_registry_item("your-namespace:your-name")
 
         Args:
-            item_id (str): The ID of the registry item.
+            item_id (str): The ID of the deleted registry item, containing either the namespace and module name
+                (for example, `my-org:my-module`) or organization ID and module name (`org-id:my-module`).
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#deleteregistryitem>`_.
         """
         request = DeleteRegistryItemRequest(item_id=item_id)
         await self._app_client.DeleteRegistryItem(request, metadata=self._metadata)
@@ -2108,7 +2284,7 @@ class AppClient:
 
         Args:
             org_id (str): The ID of the organization to create the module under.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             name (str): The name of the module. Must be unique within your organization.
 
         Raises:
@@ -2117,7 +2293,7 @@ class AppClient:
         Returns:
             Tuple[str, str]: A tuple containing the ID [0] of the new module and its URL [1].
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#createmodule>`_.
         """
         request = CreateModuleRequest(organization_id=org_id, name=name)
         response: CreateModuleResponse = await self._app_client.CreateModule(request, metadata=self._metadata)
@@ -2136,18 +2312,27 @@ class AppClient:
 
         ::
 
+            from viam.proto.app import Model
+
+            model = Model(
+                api="rdk:component:base",
+                model="my-group:cool_new_hoverboard_module:wheeled"
+            )
+
             url_of_my_module = await cloud.update_module(
                 module_id="my-group:cool_new_hoverboard_module",
                 url="https://docsformymodule.viam.com",
+                models=[model],
                 description="A base to support hoverboards.",
-                entrypoint="exec")
+                entrypoint="exec"
+            )
 
         Args:
-            module_id (str): ID of the module being updated, containing module name (for example, "my-module") or namespace and module name
-                (for example, "my-org:my-module").
+            module_id (str): ID of the module being updated, containing either the namespace and module name
+                (for example, `my-org:my-module`) or organization ID and module name (`org-id:my-module`).
             url (str): The url to reference for documentation and code (NOT the url of the module itself).
             description (str): A short description of the module that explains its purpose.
-            models (Optional[List[viam.proto.app.Model]]): list of models that are available in the module.
+            models (List[viam.proto.app.Model]): list of models that are available in the module.
             entrypoint (str): The executable to run to start the module program.
             public (bool): The visibility that should be set for the module. Defaults to False (private).
 
@@ -2157,7 +2342,7 @@ class AppClient:
         Returns:
             str: The URL of the newly updated module.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#updatemodule>`_.
         """
         request = UpdateModuleRequest(
             module_id=module_id,
@@ -2175,16 +2360,27 @@ class AppClient:
 
         ::
 
-            file_id = await cloud.upload_module_file(file=b"<file>")
+            from viam.proto.app import ModuleFileInfo
+
+            module_file_info = ModuleFileInfo(
+                module_id = "sierra:cool_new_hoverboard_module",
+                version = "1.0.0",
+                platform = "darwin/arm64"
+            )
+
+            file_id = await cloud.upload_module_file(
+                module_file_info=module_file_info,
+                file=b"<file>"
+            )
 
         Args:
             module_file_info (Optional[viam.proto.app.ModuleFileInfo]): Relevant metadata.
             file (bytes): Bytes of file to upload.
 
         Returns:
-            str: ID of uploaded file.
+            str: URL of uploaded file.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#uploadmodulefile>`_.
         """
         request_module_file_info = UploadModuleFileRequest(module_file_info=module_file_info)
         request_file = UploadModuleFileRequest(file=file)
@@ -2202,10 +2398,11 @@ class AppClient:
 
         ::
 
-            the_module = await cloud.get_module(module_id="my-cool-modular-base")
+            the_module = await cloud.get_module(module_id="my-group:my-cool-modular-base")
 
         Args:
-            module_id (str): ID of the module being retrieved, containing module name or namespace and module name.
+            module_id (str): ID of the module being retrieved, containing either the namespace and module name
+                (for example, `my-org:my-module`) or organization ID and module name (`org-id:my-module`).
 
         Raises:
             GRPCError: If an invalid module ID is passed.
@@ -2213,7 +2410,7 @@ class AppClient:
         Returns:
             viam.proto.app.Module: The module.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#getmodule>`_.
         """
         request = GetModuleRequest(module_id=module_id)
         response: GetModuleResponse = await self._app_client.GetModule(request, metadata=self._metadata)
@@ -2224,16 +2421,16 @@ class AppClient:
 
         ::
 
-            modules_list = await cloud.list_modules("org-id")
+            modules_list = await cloud.list_modules("<YOUR-ORG-ID>")
 
         Args:
             org_id (str): The ID of the organization to list modules for.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
 
         Returns:
             List[viam.proto.app.Module]: The list of modules.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#listmodules>`_.
         """
         request = ListModulesRequest(organization_id=org_id)
         response: ListModulesResponse = await self._app_client.ListModules(request, metadata=self._metadata)
@@ -2249,16 +2446,20 @@ class AppClient:
             from viam.app.app_client import APIKeyAuthorization
 
             auth = APIKeyAuthorization(
-            role="owner",
-            resource_type="robot",
-            resource_id="your-robot-id123"
+                role="owner",
+                resource_type="robot",
+                resource_id="your-machine-id123"
             )
 
-            api_key, api_key_id = cloud.create_key([auth], "my_key")
+            api_key, api_key_id = cloud.create_key(
+                org_id="<YOUR-ORG-ID>",
+                authorizations=[auth],
+                name="my_key"
+            )
 
         Args:
             org_id (str): The ID of the organization to create the key for.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
             authorizations (List[viam.proto.app.Authorization]): A list of authorizations to associate
                 with the key.
             name (Optional[str]): A name for the key. If None, defaults to the current timestamp.
@@ -2269,7 +2470,7 @@ class AppClient:
         Returns:
             Tuple[str, str]: The api key and api key ID.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#createkey>`_.
         """
         name = name if name is not None else str(datetime.now())
         authorizations_pb = [await self._create_authorization_for_new_api_key(org_id, auth) for auth in authorizations]
@@ -2287,7 +2488,7 @@ class AppClient:
         Args:
             id (str): The ID of the API key.
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#deletekey>`_.
         """
         request = DeleteKeyRequest(id=id)
         await self._app_client.DeleteKey(request, metadata=self._metadata)
@@ -2306,7 +2507,7 @@ class AppClient:
         Returns:
             Tuple[str, str]: The API key and API key id
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#createkeyfromexistingkeyauthorizations>`_.
         """
         request = CreateKeyFromExistingKeyAuthorizationsRequest(id=id)
         response: CreateKeyFromExistingKeyAuthorizationsResponse = await self._app_client.CreateKeyFromExistingKeyAuthorizations(
@@ -2320,14 +2521,17 @@ class AppClient:
 
         ::
 
-            keys = await cloud.list_keys()
+            keys = await cloud.list_keys(org_id="<YOUR-ORG-ID>")
 
         Args:
             org_id (str): The ID of the organization to list API keys for.
-                You can obtain your organization ID from the Viam app's organization settings page.
+                You can obtain your organization ID from the organization settings page.
 
         Returns:
-            List[viam.proto.app.APIKeyWithAuthorizations]: The existing API keys and authorizations."""
+            List[viam.proto.app.APIKeyWithAuthorizations]: The existing API keys and authorizations.
+
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#listkeys>`_.
+        """
         request = ListKeysRequest(org_id=org_id)
         response: ListKeysResponse = await self._app_client.ListKeys(request, metadata=self._metadata)
         return list(response.api_keys)
@@ -2337,7 +2541,7 @@ class AppClient:
 
         ::
 
-            id, key = await cloud.rotate_key("key-id")
+            key, id = await cloud.rotate_key("key-id")
 
         Args:
             id (str): The ID of the key to be rotated.
@@ -2345,8 +2549,148 @@ class AppClient:
         Returns:
             Tuple[str, str]: The API key and API key id
 
-        For more information, see `Fleet Management API <https://docs.viam.com/appendix/apis/fleet/>`_.
+        For more information, see `Fleet Management API <https://docs.viam.com/dev/reference/apis/fleet/#rotatekey>`_.
         """
         request = RotateKeyRequest(id=id)
         response: RotateKeyResponse = await self._app_client.RotateKey(request, metadata=self._metadata)
         return response.key, response.id
+
+    async def get_organization_metadata(self, org_id: str) -> Mapping[str, Any]:
+        """Get an organization's user-defined metadata.
+
+        ::
+
+            metadata = await cloud.get_organization_metadata(org_id="<YOUR-ORG-ID>")
+
+        Args:
+            org_id (str): The ID of the organization with which the user-defined metadata is associated.
+                You can obtain your organization ID from the organization settings page.
+
+        Returns:
+            Mapping[str, Any]: The user-defined metadata converted from JSON to a Python dictionary
+        """
+        request = GetOrganizationMetadataRequest(organization_id=org_id)
+        response: GetOrganizationMetadataResponse = await self._app_client.GetOrganizationMetadata(request, metadata=self._metadata)
+        return struct_to_dict(response.data)
+
+    async def update_organization_metadata(self, org_id: str, metadata: Mapping[str, Any]) -> None:
+        """Update an organization's user-defined metadata.
+
+        ::
+
+             await cloud.update_organization_metadata(org_id="<YOUR-ORG-ID>", metadata={
+                 "TEST_API_KEY": "ABC123",
+             })
+
+        Args:
+            organization_id (str): The ID of the organization with which to associate the user-defined metadata.
+                You can obtain your organization ID from the organization settings page.
+            metadata (Mapping[str, Any]): The user-defined metadata to upload as a Python dictionary.
+        """
+        request = UpdateOrganizationMetadataRequest(organization_id=org_id, data=dict_to_struct(metadata))
+        _: UpdateOrganizationMetadataResponse = await self._app_client.UpdateOrganizationMetadata(request, metadata=self._metadata)
+
+    async def get_location_metadata(self, location_id: str) -> Mapping[str, Any]:
+        """Get a location's user-defined metadata.
+
+        ::
+
+            metadata = await cloud.get_location_metadata(location_id="<YOUR-LOCATION-ID>")
+
+        Args:
+            location_id (str): The ID of the location with which the user-defined metadata is associated.
+                You can obtain your location ID from the location's page.
+
+        Returns:
+            Mapping[str, Any]: The user-defined metadata converted from JSON to a Python dictionary.
+        """
+        request = GetLocationMetadataRequest(location_id=location_id)
+        response: GetLocationMetadataResponse = await self._app_client.GetLocationMetadata(request, metadata=self._metadata)
+        return struct_to_dict(response.data)
+
+    async def update_location_metadata(self, location_id: str, metadata: Mapping[str, Any]) -> None:
+        """Update a location's user-defined metadata.
+
+        ::
+
+             await cloud.update_location_metadata(location_id="<YOUR-LOCATION-ID>", metadata={
+                 "TEST_API_KEY": "ABC123",
+             })
+
+        Args:
+            location_id (str): The ID of the location with which to associate the user-defined metadata.
+                You can obtain your location ID from the location's page.
+            metadata (Mapping[str, Any]): The user-defined metadata converted from JSON to a Python dictionary.
+        """
+        request = UpdateLocationMetadataRequest(location_id=location_id, data=dict_to_struct(metadata))
+        _: UpdateLocationMetadataResponse = await self._app_client.UpdateLocationMetadata(request, metadata=self._metadata)
+
+    async def get_robot_metadata(self, robot_id: str) -> Mapping[str, Any]:
+        """Get a robot's user-defined metadata.
+
+        ::
+
+            metadata = await cloud.get_robot_metadata(robot_id="<YOUR-ROBOT-ID>")
+
+        Args:
+            robot_id (str): The ID of the robot with which the user-defined metadata is associated.
+                You can obtain your robot ID from the machine page.
+
+        Returns:
+            Mapping[str, Any]: The user-defined metadata converted from JSON to a Python dictionary.
+        """
+        request = GetRobotMetadataRequest(id=robot_id)
+        response: GetRobotMetadataResponse = await self._app_client.GetRobotMetadata(request, metadata=self._metadata)
+        return struct_to_dict(response.data)
+
+    async def update_robot_metadata(self, robot_id: str, metadata: Mapping[str, Any]) -> None:
+        """Update a robot's user-defined metadata.
+
+        ::
+
+             await cloud.update_robot_metadata(robot_id="<YOUR-ROBOT-ID>", metadata={
+                 "TEST_API_KEY": "ABC123",
+             })
+
+        Args:
+            robot_id (str): The ID of the robot with which to associate the user-defined metadata.
+                You can obtain your robot ID from the machine page.
+            metadata (Mapping[str, Any]): The user-defined metadata converted from JSON to a Python dictionary.
+        """
+        request = UpdateRobotMetadataRequest(id=robot_id, data=dict_to_struct(metadata))
+        _: UpdateRobotMetadataResponse = await self._app_client.UpdateRobotMetadata(request, metadata=self._metadata)
+
+    async def get_robot_part_metadata(self, robot_part_id: str) -> Mapping[str, Any]:
+        """Get a robot part's user-defined metadata.
+
+        ::
+
+            metadata = await cloud.get_robot_part_metadata(robot_part_id="<YOUR-ROBOT-PART-ID>")
+
+        Args:
+            robot_part_id (str): The ID of the robot part with which the user-defined metadata is associated.
+                You can obtain your robot part ID from the machine page.
+
+        Returns:
+            Mapping[str, Any]: The user-defined metadata converted from JSON to a Python dictionary.
+        """
+        request = GetRobotPartMetadataRequest(id=robot_part_id)
+        response: GetRobotPartMetadataResponse = await self._app_client.GetRobotPartMetadata(request, metadata=self._metadata)
+        return struct_to_dict(response.data)
+
+    async def update_robot_part_metadata(self, robot_part_id: str, metadata: Mapping[str, Any]) -> None:
+        """Update a robot part's user-defined metadata.
+
+        ::
+
+             await cloud.update_robot_part_metadata(robot_part_id="<YOUR-ROBOT-PART-ID>", metadata={
+                 "TEST_API_KEY": "ABC123",
+             })
+
+        Args:
+            robot_id (str): The ID of the robot part with which to associate the user-defined metadata.
+                You can obtain your robot part ID from the machine page.
+            metadata (Mapping[str, Any]): The user-defined metadata converted from JSON to a Python dictionary.
+        """
+        request = UpdateRobotPartMetadataRequest(id=robot_part_id, data=dict_to_struct(metadata))
+        _: UpdateRobotPartMetadataResponse = await self._app_client.UpdateRobotPartMetadata(request, metadata=self._metadata)