Merge branch 'feature/image' of https://github.com/TSDV-VNU-API-Testing/schemathesis into feature/image

Author: Cheesedz

src/schemathesis/cli/output/default.py

@@ -1,43 +1,44 @@
 from __future__ import annotations
+
 import base64
 import os
 import platform
 import shutil
 import textwrap
 import time
+from importlib import metadata
 from itertools import groupby
 from queue import Queue
 from typing import Any, Generator, cast
 
 import click
-from importlib import metadata
 
 from ... import service
 from ...code_samples import CodeSampleStyle
 from ...constants import (
  DISCORD_LINK,
+ FALSE_VALUES,
  FLAKY_FAILURE_MESSAGE,
+ GITHUB_APP_LINK,
+ ISSUE_TRACKER_URL,
  REPORT_SUGGESTION_ENV_VAR,
  SCHEMATHESIS_TEST_CASE_HEADER,
  SCHEMATHESIS_VERSION,
- FALSE_VALUES,
- ISSUE_TRACKER_URL,
- GITHUB_APP_LINK,
 )
 from ...exceptions import RuntimeErrorType, prepare_response_payload
 from ...experimental import GLOBAL_EXPERIMENTS
 from ...models import Status
 from ...runner import events
 from ...runner.events import InternalErrorType, SchemaErrorType
 from ...runner.serialization import (
+ SerializedCheck,
  SerializedError,
  SerializedTestResult,
  deduplicate_failures,
- SerializedCheck,
 )
+from ...specs.openapi._vas import logger
 from ..context import ExecutionContext, FileReportContext, ServiceReportContext
 from ..handlers import EventHandler
-from ...specs.openapi._vas import logger
 
 SPINNER_REPETITION_NUMBER = 10
 
@@ -532,7 +533,7 @@ def display_service_unauthorized(hostname: str) -> None:
 
 def display_service_error(event: service.Error, message_prefix: str = "") -> None:
  """Show information about an error during communication with Schemathesis.io."""
- from requests import RequestException, HTTPError, Response
+ from requests import HTTPError, RequestException, Response
 
  if isinstance(event.exception, HTTPError):
  response = cast(Response, event.exception.response)

src/schemathesis/models.py

@@ -410,7 +410,7 @@ def as_requests_kwargs(
  "deps/schemathesis/src/schemathesis/models.py -> new extra: %s", new_extra
  )
 
- additional_headers = extra.pop("headers", None)
+ additional_headers = new_extra.pop("headers", None)
  if additional_headers:
  # Additional headers, needed for the serializer
  for key, value in additional_headers.items():
@@ -1062,7 +1062,10 @@ def from_case(cls, case: Case, session: requests.Session) -> Request:
  @classmethod
  def from_prepared_request(cls, prepared: requests.PreparedRequest) -> Request:
  """A prepared request version is already stored in `requests.Response`."""
- logger.debug("deps/schemathesis/src/schemathesis/models.py: from_prepared_request in Request -> body: %s", prepared.body)
+ logger.debug(
+ "deps/schemathesis/src/schemathesis/models.py: from_prepared_request in Request -> body: %s",
+ prepared.body,
+ )
  body = prepared.body
  if isinstance(body, str):
  # can be a string for `application/x-www-form-urlencoded`
@@ -1175,9 +1178,15 @@ def from_requests(
  status: Status,
  checks: list[Check],
  ) -> Interaction:
- 
- logger.debug("deps/schemathesis/src/schemathesis/models.py: from_requests in Interaction -> response.request.body: %s", response.request.body)
- logger.debug("deps/schemathesis/src/schemathesis/models.py: from_requests in Interaction -> case.body: %s", case.body)
+
+ logger.debug(
+ "deps/schemathesis/src/schemathesis/models.py: from_requests in Interaction -> response.request.body: %s",
+ response.request.body,
+ )
+ logger.debug(
+ "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))
@@ -1187,7 +1196,7 @@ def from_requests(
  # 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))

src/schemathesis/specs/openapi/_vas.py

@@ -3,6 +3,7 @@
 import sys
 from functools import partial
 
+from dotenv import dotenv_values as get_dotenv_values
 from hypothesis import strategies as st
 
 # from faker import Faker
@@ -30,7 +31,9 @@
 # from faker_file.providers.zip_file import ZipFileProvider
 
 
-DEV = True
+dotenv_values = get_dotenv_values(".env")
+PYTHON_ENV = dotenv_values.get("PYTHON_ENV", None)
+DEV = PYTHON_ENV != "PROD"
 
 # FAKER = Faker()