addRawRequestMethod: update-changes-requested

Author: kcbiradar

openfga_sdk/api_client.py

@@ -420,7 +420,7 @@ async def __call_api(
             if _return_http_data_only:
                 return return_data
             else:
-                return (return_data, response_data.status, response_data.getheaders())
+                return (return_data, response_data.status, response_data.headers)
 
     def _parse_retry_after_header(self, headers) -> int:
         retry_after_header = headers.get("retry-after")

openfga_sdk/client/client.py

@@ -1216,15 +1216,15 @@ async def raw_request(
                     TelemetryAttributes.fga_client_request_store_id
                 ] = self.get_store_id()
 
-        _, http_status, http_headers = await self._api_client.call_api(
+        await self._api_client.call_api(
             resource_path=resource_path,
             method=method.upper(),
             query_params=query_params_list if query_params_list else None,
             header_params=auth_headers if auth_headers else None,
             body=body_params,
             response_types_map={},
             auth_settings=[],
-            _return_http_data_only=False,
+            _return_http_data_only=True,
             _preload_content=True,
             _retry_params=retry_params,
             _oauth2_client=self._api._oauth2_client,
@@ -1262,7 +1262,7 @@ async def raw_request(
                 response_body = rest_response.data
 
         return RawResponse(
-            status=http_status,
-            headers=http_headers if http_headers else {},
+            status=rest_response.status,
+            headers=dict(rest_response.getheaders()),
             body=response_body,
         )

openfga_sdk/client/models/raw_response.py

@@ -7,6 +7,7 @@
 
 from dataclasses import dataclass
 from typing import Any
+import json
 
 
 @dataclass
@@ -34,34 +35,13 @@ def json(self) -> dict[str, Any] | None:
         """
         Return the response body as a JSON dictionary.
 
-        If the body is already a dict (parsed JSON), returns it directly.
-        If the body is a string or bytes, attempts to parse it as JSON.
-        Returns None if body is None or cannot be parsed.
+        The body is already parsed during the request, so this typically
+        just returns the body if it's a dict, or None otherwise.
 
         :return: Parsed JSON dictionary or None
         """
-        if self.body is None:
-            return None
-
         if isinstance(self.body, dict):
             return self.body
-
-        if isinstance(self.body, str):
-            import json
-
-            try:
-                return json.loads(self.body)
-            except (json.JSONDecodeError, ValueError):
-                return None
-
-        if isinstance(self.body, bytes):
-            import json
-
-            try:
-                return json.loads(self.body.decode("utf-8"))
-            except (json.JSONDecodeError, ValueError, UnicodeDecodeError):
-                return None
-
         return None
 
     def text(self) -> str | None:
@@ -83,8 +63,6 @@ def text(self) -> str | None:
                 return self.body.decode("utf-8", errors="replace")
 
         if isinstance(self.body, dict):
-            import json
-
             return json.dumps(self.body)
 
         return str(self.body)

openfga_sdk/sync/api_client.py

@@ -420,7 +420,7 @@ def __call_api(
             if _return_http_data_only:
                 return return_data
             else:
-                return (return_data, response_data.status, response_data.getheaders())
+                return (return_data, response_data.status, response_data.headers)
 
     def _parse_retry_after_header(self, headers) -> int:
         retry_after_header = headers.get("retry-after")

openfga_sdk/sync/client/client.py

@@ -1215,15 +1215,15 @@ def raw_request(
                     TelemetryAttributes.fga_client_request_store_id
                 ] = self.get_store_id()
 
-        _, http_status, http_headers = self._api_client.call_api(
+        self._api_client.call_api(
             resource_path=resource_path,
             method=method.upper(),
             query_params=query_params_list if query_params_list else None,
             header_params=auth_headers if auth_headers else None,
             body=body_params,
             response_types_map={},
             auth_settings=[],
-            _return_http_data_only=False,
+            _return_http_data_only=True,
             _preload_content=True,
             _retry_params=retry_params,
             _oauth2_client=self._api._oauth2_client,
@@ -1262,7 +1262,7 @@ def raw_request(
                 response_body = rest_response.data
 
         return RawResponse(
-            status=http_status,
-            headers=http_headers if http_headers else {},
+            status=rest_response.status,
+            headers=dict(rest_response.getheaders()),
             body=response_body,
         )