RSDK-12349 - remove location secret connection code (#1020)

Author: stuqdog

.github/workflows/license_finder.yml

@@ -14,10 +14,12 @@ jobs:
     timeout-minutes: 30
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v7
+        with:
+          python-version: "3.13"
 
       - name: Setup Python
         run: |

src/viam/app/app_client.py

@@ -540,22 +540,19 @@ async def main():
     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
 
@@ -1016,7 +1013,7 @@ async def get_location(self, location_id: Optional[str] = None) -> Location:
 
         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
 
@@ -1155,7 +1152,7 @@ async def location_auth(self, location_id: Optional[str] = None) -> LocationAuth
 
         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
 
@@ -1179,7 +1176,7 @@ async def create_location_secret(self, location_id: Optional[str] = None) -> Loc
 
         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
 
@@ -1204,7 +1201,7 @@ async def delete_location_secret(self, secret_id: str, location_id: Optional[str
         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
+            location_id=location_id if location_id else "", secret_id=secret_id
         )
         await self._app_client.DeleteLocationSecret(request, metadata=self._metadata)
 
@@ -1653,7 +1650,7 @@ async def list_robots(self, location_id: Optional[str] = None) -> List[Robot]:
 
         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)
 
@@ -1677,7 +1674,7 @@ async def new_robot(self, name: str, location_id: Optional[str] = None) -> str:
 
         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
 
@@ -1708,7 +1705,7 @@ async def update_robot(self, robot_id: str, name: str, location_id: Optional[str
         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 ""
+            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

src/viam/app/viam_client.py

@@ -85,9 +85,6 @@ async def create_from_dial_options(cls, dial_options: DialOptions, app_url: Opti
 
         self = cls()
         self._dial_options = dial_options
-        self._location_id = None
-        if dial_options.credentials.type == "robot-location-secret":
-            self._location_id = dial_options.auth_entity.split(".")[1]
         if app_url is None:
             app_url = "app.viam.com"
         self._channel = await _dial_app(app_url)
@@ -98,7 +95,6 @@ async def create_from_dial_options(cls, dial_options: DialOptions, app_url: Opti
     _channel: Channel
     _metadata: Mapping[str, str]
     _closed: bool = False
-    _location_id: Optional[str]
     _dial_options: DialOptions
 
     @property
@@ -140,7 +136,7 @@ async def main():
                 # Instantiate an AppClient called "fleet" to run fleet management API methods on
                 fleet = viam_client.app_client
         """
-        return AppClient(self._channel, self._metadata, self._location_id)
+        return AppClient(self._channel, self._metadata)
 
     @property
     def ml_training_client(self) -> MLTrainingClient:

src/viam/rpc/dial.py

@@ -31,7 +31,7 @@
 class Credentials:
     """Credentials to connect to the machine and app.viam.com."""
 
-    type: Union[Literal["robot-location-secret"], Literal["robot-secret"], Literal["api-key"]]
+    type: Union[Literal["robot-secret"], Literal["api-key"]]
     """The type of credential
     """