fix

Signed-off-by: Edward Oakes <ed.nmi.oakes@gmail.com>

python/ray/serve/_private/common.py

@@ -28,20 +28,14 @@ class DeploymentID:
     name: str
     app_name: str = SERVE_DEFAULT_APP_NAME
 
-    def __repr__(self):
-        s = f"Deployment(name='{self.name}'"
-        if not self.app_name or self.app_name == SERVE_DEFAULT_APP_NAME:
-            s += ")"
-        else:
-            s += f", app='{self.app_name}')"
-
-        return s
+    def to_replica_actor_class_name(self):
+        return f"ServeReplica:{self.app_name}:{self.name}"
 
     def __str__(self):
-        return f"{self.app_name}_{self.name}"
+        return f"Deployment(name='{self.name}', app='{self.app_name}')"
 
-    def to_replica_actor_class_name(self):
-        return f"ServeReplica:{self.app_name}:{self.name}"
+    def __repr__(self):
+        return str(self)
 
 
 ReplicaTag = str

python/ray/serve/_private/deployment_state.py

@@ -1311,7 +1311,7 @@ def get_checkpoint_data(self) -> DeploymentTargetState:
     def recover_target_state_from_checkpoint(
         self, target_state_checkpoint: DeploymentTargetState
     ):
-        logger.info(f"Recovering target state for {repr(self._id)} from checkpoint.")
+        logger.info(f"Recovering target state for {self._id} from checkpoint.")
         self._target_state = target_state_checkpoint
         self._deployment_scheduler.on_deployment_deployed(
             self._id, self._target_state.info.replica_config
@@ -1327,7 +1327,7 @@ def recover_current_state_from_replica_actor_names(
             "recovering current state from replica actor names."
         )
         logger.info(
-            f"Recovering current state for {repr(self._id)} "
+            f"Recovering current state for {self._id} "
             f"from {len(replica_actor_names)} live actors."
         )
         # All current states use default value, only attach running replicas.
@@ -1485,7 +1485,7 @@ def _set_target_state_deleting(self) -> None:
             trigger=DeploymentStatusInternalTrigger.DELETE
         )
         logger.info(
-            f"Deleting {repr(self._id)}",
+            f"Deleting {self._id}",
             extra={"log_to_stderr": False},
         )
 
@@ -1627,7 +1627,7 @@ def deploy(self, deployment_info: DeploymentInfo) -> bool:
             )
 
         logger.info(
-            f"Deploying new version of {repr(self._id)} "
+            f"Deploying new version of {self._id} "
             f"(initial target replicas: {target_num_replicas})."
         )
         self._replica_constructor_retry_counter = 0
@@ -1694,7 +1694,7 @@ def autoscale(self) -> int:
             return
 
         logger.info(
-            f"Autoscaling {repr(self._id)} to {decision_num_replicas} replicas. "
+            f"Autoscaling {self._id} to {decision_num_replicas} replicas. "
             f"Current num requests: {total_num_requests}, "
             f"current num running replicas: {num_running_replicas}."
         )
@@ -1811,13 +1811,13 @@ def _stop_or_update_outdated_version_replicas(self, max_to_stop=math.inf) -> boo
 
         if code_version_changes > 0:
             logger.info(
-                f"Stopping {code_version_changes} replicas of {repr(self._id)} "
+                f"Stopping {code_version_changes} replicas of {self._id} "
                 "with outdated versions."
             )
 
         if reconfigure_changes > 0:
             logger.info(
-                f"Updating {reconfigure_changes} replicas of {repr(self._id)} "
+                f"Updating {reconfigure_changes} replicas of {self._id} "
                 "with outdated deployment configs."
             )
             # Record user config lightweight update
@@ -1933,7 +1933,7 @@ def _scale_deployment_replicas(
 
                 self._last_retry = time.time()
                 added_replicas = f"{to_add} replica{'s' if to_add > 1 else ''}"
-                logger.info(f"Adding {added_replicas} to {repr(self._id)}.")
+                logger.info(f"Adding {added_replicas} to {self._id}.")
                 for _ in range(to_add):
                     replica_name = ReplicaName(
                         self.app_name, self.deployment_name, get_random_string()
@@ -1952,7 +1952,7 @@ def _scale_deployment_replicas(
         elif delta_replicas < 0:
             to_remove = -delta_replicas
             removed_replicas = f"{to_remove} replica{'s' if to_remove > 1 else ''}"
-            logger.info(f"Removing {removed_replicas} from {repr(self._id)}.")
+            logger.info(f"Removing {removed_replicas} from {self._id}.")
             downscale = DeploymentDownscaleRequest(
                 deployment_id=self._id, num_to_stop=to_remove
             )

python/ray/serve/_private/replica_scheduler/pow_2_scheduler.py

@@ -252,7 +252,7 @@ def update_replicas(self, replicas: List[ReplicaWrapper]):
 
         if self._replica_id_set != new_replica_id_set:
             logger.info(
-                f"Got updated replicas for {repr(self._deployment_id)}: "
+                f"Got updated replicas for {self._deployment_id}: "
                 f"{new_replica_id_set}.",
                 extra={"log_to_stderr": False},
             )
@@ -345,7 +345,7 @@ async def choose_two_replicas_with_backoff(
                 while len(self._replicas) == 0:
                     logger.info(
                         "No replicas are currently available for "
-                        f"{repr(self._deployment_id)}.",
+                        f"{self._deployment_id}.",
                         extra={"log_to_stderr": False},
                     )
                     self._replicas_updated_event.clear()

python/ray/serve/tests/test_standalone_2.py

@@ -351,14 +351,14 @@ def __call__(self):
         # Driver 1 (starts Serve controller)
         output = subprocess.check_output(["python", f1.name], stderr=subprocess.STDOUT)
         assert "Connecting to existing Ray cluster" in output.decode("utf-8")
-        assert "Adding 1 replica to Deployment(name='A')" in output.decode("utf-8")
+        assert "Adding 1 replica to Deployment(name='A'" in output.decode("utf-8")
 
         f2.write(file2.encode("utf-8"))
         f2.seek(0)
         # Driver 2 (reconnects to the same Serve controller)
         output = subprocess.check_output(["python", f2.name], stderr=subprocess.STDOUT)
         assert "Connecting to existing Ray cluster" in output.decode("utf-8")
-        assert "Adding 1 replica to Deployment(name='B')" in output.decode("utf-8")
+        assert "Adding 1 replica to Deployment(name='B'" in output.decode("utf-8")
 
 
 def test_checkpoint_deleted_on_serve_shutdown(start_and_shutdown_ray_cli_function):