Improve type hints and None safety checks.

PiperOrigin-RevId: 856633232
Change-Id: I581ddf712bebc1fc48bf1bcd7820d6c58626021c

Author: Tsunami Team

plugin_server/py/common/net/http/http_response.py

@@ -1,8 +1,9 @@
 """HTTP response utility."""
 
 import abc
+from collections.abc import Mapping
 import json
-from typing import Any, Optional
+from typing import Any
 from common.net.http.http_headers import HttpHeaders
 from common.net.http.http_status import HttpStatus
 
@@ -20,19 +21,18 @@ class HttpResponse(metaclass=abc.ABCMeta):
   """
 
   def __init__(self):
-    self.status: HttpStatus = None
-    self.url: Optional[str] = None
-    self.headers: HttpHeaders = None
-    self.body: Optional[bytes] = None
+    self.status: HttpStatus | None = None
+    self.url: str | None = None
+    self.headers: HttpHeaders | None = None
+    self.body: bytes | None = None
 
   def body_string(self) -> str:
     """Get the body data as a UTF-8 encoded string."""
-    try:
-      return self.body.decode('utf-8')
-    except AttributeError:
+    if self.body is None:
       return ''
+    return self.body.decode('utf-8')
 
-  def body_json(self) -> Optional[dict[str, Any]]:
+  def body_json(self) -> Mapping[str, Any] | None:
     """Parse the response body as JSON. Returns null if parsing failed."""
     try:
       return json.loads(self.body_string())
@@ -71,7 +71,7 @@ def set_headers(self, headers: HttpHeaders):
     self.http_response.headers = headers
     return self
 
-  def set_response_body(self, response_body: Optional[bytes]):
+  def set_response_body(self, response_body: bytes | None):
     """Set the body for the response."""
     self.http_response.body = response_body
     return self

plugin_server/py/plugin/tcs_client.py

@@ -104,12 +104,13 @@ def _send_polling_request(
     request = self._build_polling_request(secret_string)
     try:
       response = self.http_client.send(request)
-      if response.status.is_success():
+      if response.status and response.status.is_success():
         return json_format.Parse(
             response.body_string(), polling_pb2.PollingResult()
         )
       else:
-        logging.info('OOB server returned %s.', response.status.code)
+        code = response.status.code if response.status else 'UNKNOWN'
+        logging.info('OOB server returned %s.', code)
     except (json_format.ParseError, ValueError):
       logging.exception('Polling request failed.')
     return None