fixed pre-commit merge issues

Author: atihkin

src/together/cli/api/endpoints.py

@@ -337,6 +337,18 @@ def delete(client: Together, endpoint_id: str) -> None:
     type=click.Choice(["dedicated", "serverless"]),
     help="Filter by endpoint type",
 )
+@click.option(
+    "--usage-type",
+    type=click.Choice(["on-demand", "reserved"]),
+    help="Filter by usage type",
+)
+@click.option(
+    "--mine",
+    is_flag=True,
+    default=False,
+    help="Show only endpoints owned by you",
+)
+
 @click.pass_obj
 @handle_api_errors
 def list(

src/together/resources/endpoints.py

@@ -33,7 +33,7 @@ def list(
             client=self._client,
         )
 
-        params = {}
+        params: Dict[str, str] = {}
         if type is not None:
             params["type"] = type
         if usage_type is not None:
@@ -247,7 +247,7 @@ def list_hardware(self, model: Optional[str] = None) -> List[HardwareWithStatus]
             client=self._client,
         )
 
-        params = {}
+        params: Dict[str, str] = {}
         if model is not None:
             params["model"] = model
 
@@ -292,7 +292,7 @@ async def list(
             client=self._client,
         )
 
-        params = {}
+        params: Dict[str, str] = {}
         if type is not None:
             params["type"] = type
         if usage_type is not None: