refactor: remove prefix field from new_body

Author: Cheesedz

src/schemathesis/models.py

@@ -352,17 +352,24 @@ def as_requests_kwargs(
 
  if isinstance(self.body, dict):
  # Create a new body without meta-data
- # new_body = {
- #  key: value
- #  for key, value in self.body.items()
- #  if not key.startswith(VAS_KEY_PREFIX)
- # }
+ body_without_prefixed_field = {
+ key: value
+ for key, value in self.body.items()
+ if not key.startswith(VAS_KEY_PREFIX)
+ }
  self.metadata = {
  f"{key[len(VAS_KEY_PREFIX) + 1:]}": value
  for key, value in self.body.items()
  if key.startswith(VAS_KEY_PREFIX)
  }
- # self.body = new_body
+ new_body = {
+ **body_without_prefixed_field,
+ **{
+ k: obj["image_name"]
+ for k, obj in self.metadata.items()
+ }
+ }
+ self.body = new_body
 
  logger.debug(
  "deps/schemathesis/src/schemathesis/models.py: new body: %s", self.body
@@ -411,6 +418,7 @@ def as_requests_kwargs(
  )
 
  additional_headers = new_extra.pop("headers", None)
+ # additional_headers = extra.pop("headers", None)
  if additional_headers:
  # Additional headers, needed for the serializer
  for key, value in additional_headers.items():
@@ -422,6 +430,7 @@ def as_requests_kwargs(
  "headers": final_headers,
  "params": self.query,
  **new_extra,
+ # **extra,
  }
 
  def call(
@@ -864,6 +873,7 @@ def as_strategy(
  ) -> st.SearchStrategy:
  """Turn this API operation into a Hypothesis strategy."""
 
+ logger.debug("deps/schemathesis/src/schemathesis/models.py: as_strategy -> kwargs: %s", kwargs)
  # Cai nay quan trong cuc ki
  strategy = self.schema.get_case_strategy(
  self,
@@ -1187,27 +1197,6 @@ def from_requests(
  "deps/schemathesis/src/schemathesis/models.py: from_requests in Interaction -> case.body: %s",
  case.body,
  )
- # new_request: Request = Request.from_prepared_request(response.request)
- # if case.metadata is not None and new_request.body is not None:
- # logger.debug("deps/schemathesis/src/schemathesis/models.py: from_requests in Interaction -> request.body: %s", base64.b64decode(new_request.body))
- # for key in case.metadata:
- # if isinstance(case.body, dict) and key in case.body:
- # logger.debug("")
- # case.body[key] = case.metadata[key]["image_name"]
- # logger.debug("deps/schemathesis/src/schemathesis/models.py: from_requests in Interaction -> %s", case.body)
- # new_request.body = base64.b64encode(str(case.body).encode("utf-8")).decode("utf-8")
-
- # Remove image data from the request body and replace it with the image name
- # if new_request.body is not None:
- # # logger.debug("deps/schemathesis/src/schemathesis/models.py: from_requests in Interaction -> %s", base64.b64decode(Request.from_prepared_request(response.request).body))
- # base64_body = base64.b64decode(Request.from_prepared_request(response.request).body)
- # if b"filename" in base64_body:
- # start = base64_body.find(b"\r\n\r\n", base64_body.find(b"filename"), ) + 4
- # end_of_image_name = base64_body.find(b"\r\n", base64_body.find(b"filename"), )
- # image_name = base64_body[base64_body.find(b"filename") + 10:end_of_image_name]
- # end = base64_body.find(b"\r\n--", start, )
- # request_body = base64_body[:start] + image_name + base64_body[end:]
- # new_request.body = base64.b64encode(request_body).decode("utf-8")
  return cls(
  request=Request.from_prepared_request(response.request),
  response=Response.from_requests(response),

src/schemathesis/runner/impl/core.py

@@ -792,15 +792,15 @@ def _network_test(
  run_targets(targets, context)
  status = Status.success
  try:
- #logger.debug("kwargs in core.py: %s", kwargs)
+ # logger.debug("kwargs in core.py: %s", kwargs)
  requests_kwargs = case.as_requests_kwargs(
  base_url=case.get_full_base_url(), headers=headers
  )
  if 'files' in requests_kwargs:
- existing_tuple = requests_kwargs['files'][0]
+ # existing_tuple = requests_kwargs['files'][0]
  #logger.debug("existing tuple in kwargs in core.py: %s", existing_tuple)
 
- if case.metadata is not None:
+ if case.metadata != {}:
  for i, (key, value) in enumerate(requests_kwargs['files']):
  # Check if the key is in metadata
  if key in case.metadata:
@@ -817,11 +817,15 @@ def _network_test(
  # requests_kwargs['files'][0][1] = case.metadata['image_name']
  #logger.debug("files in kwargs in core.py: %s", requests_kwargs['files'][0][1])
  #logger.debug("request_kargs in core.py: %s", requests_kwargs)
- old_content_length = response.request.headers.get('Content-Length', '0')
- #logger.debug("old request content length in core.py: %s", old_content_length)
+ ### Create new request but reserve old content length
+ # old_content_length = response.request.headers.get('Content-Length')
+ # #logger.debug("old request content length in core.py: %s", old_content_length)
+ # request = requests.Request(**requests_kwargs).prepare()
+ # #logger.debug("request content length in core.py: %s", request.headers.get('Content-Length'))
+ # request.headers['Content-Length'] = old_content_length # type: ignore
+
+ ### Create new request with new content length
  request = requests.Request(**requests_kwargs).prepare()
- #logger.debug("request content length in core.py: %s", request.headers.get('Content-Length'))
- request.headers['Content-Length'] = old_content_length # type: ignore
  #logger.debug("new request content length in core.py: %s", request.headers.get('Content-Length'))
  response.request = request
  #logger.debug("case in core.py: %s", case.body)