Preliminary removal of legacy/backcompat code

Signed-off-by: Paul Van Eck <[email protected]>

Author: pvaneck

eng/tox/run_pyright.py

@@ -88,6 +88,7 @@ def get_pyright_config_path(args):
 
     paths = [
         os.path.join(args.target_package, "azure"),
+        os.path.join(args.target_package, "generic"),
         os.path.join(args.target_package, "samples"),
     ]
 

sdk/core/azure-core/azure/core/configuration.py

@@ -75,6 +75,9 @@ class Configuration(GenericConfiguration):  # pylint: disable=too-many-instance-
     def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
 
+        # Http logger configuration
+        self.http_logging_policy: Optional[AnyPolicy[HTTPRequestType, HTTPResponseType]] = None
+
          # Custom hook configuration
         self.custom_hook_policy: Optional[AnyPolicy[HTTPRequestType, HTTPResponseType]] = None
 

sdk/core/azure-core/dev_requirements.txt

@@ -7,4 +7,3 @@ opencensus-ext-threading
 -e ../../../tools/azure-sdk-tools
 -e ../../../tools/azure-devtools
 -e tests/testserver_tests/coretestserver
--e ../generic-core/

sdk/core/azure-core/setup.py

@@ -72,6 +72,9 @@
         "requests>=2.18.4",
         "six>=1.11.0",
         "typing-extensions>=4.6.0",
+
+        # Generic core package. Github URL is temporary until we release the package.
+        "generic-core @ git+https://github.com/Azure/azure-sdk-for-python.git@feature/generic-core#subdirectory=sdk/core/generic-core"
     ],
     extras_require={
         "aio": [

sdk/core/generic-core/dev_requirements.txt

@@ -2,3 +2,5 @@ requests
 aiohttp>=3.0
 -e ../../../tools/azure-sdk-tools
 -e ../../../tools/azure-devtools
+-e tests/testserver_tests/coretestserver
+../../core/azure-core

sdk/core/generic-core/generic/core/_pipeline_client.py

@@ -34,7 +34,6 @@
 from .pipeline.policies import (
     ContentDecodePolicy,
     DistributedTracingPolicy,
-    HttpLoggingPolicy,
     RequestIdPolicy,
     RetryPolicy,
     SensitiveHeaderCleanupPolicy,
@@ -140,7 +139,6 @@ def _build_pipeline(
                     config.logging_policy,
                     DistributedTracingPolicy(**kwargs),
                     SensitiveHeaderCleanupPolicy(**kwargs) if config.redirect_policy else None,
-                    config.http_logging_policy or HttpLoggingPolicy(**kwargs),
                 ]
             )
         else:

sdk/core/generic-core/generic/core/_pipeline_client_async.py

@@ -44,7 +44,6 @@
 from .pipeline.policies import (
     ContentDecodePolicy,
     DistributedTracingPolicy,
-    HttpLoggingPolicy,
     RequestIdPolicy,
     AsyncRetryPolicy,
     SensitiveHeaderCleanupPolicy,
@@ -223,7 +222,6 @@ def _build_pipeline(
                     config.logging_policy,
                     DistributedTracingPolicy(**kwargs),
                     SensitiveHeaderCleanupPolicy(**kwargs) if config.redirect_policy else None,
-                    config.http_logging_policy or HttpLoggingPolicy(**kwargs),
                 ]
             )
         else:

sdk/core/generic-core/generic/core/configuration.py

@@ -53,7 +53,6 @@ class Configuration(Generic[HTTPRequestType, HTTPResponseType]):  # pylint: disa
     :ivar redirect_policy: Provides configuration parameters for redirects.
     :ivar retry_policy: Provides configuration parameters for retries in the pipeline.
     :ivar logging_policy: Provides configuration parameters for logging.
-    :ivar http_logging_policy: Provides configuration parameters for HTTP specific logging.
     :ivar user_agent_policy: Provides configuration parameters to append custom values to the
      User-Agent header.
     :ivar authentication_policy: Provides configuration parameters for adding a bearer token Authorization
@@ -86,9 +85,6 @@ def __init__(self, **kwargs: Any) -> None:
         # Logger configuration
         self.logging_policy: Optional[AnyPolicy[HTTPRequestType, HTTPResponseType]] = None
 
-        # Http logger configuration
-        self.http_logging_policy: Optional[AnyPolicy[HTTPRequestType, HTTPResponseType]] = None
-
         # User Agent configuration
         self.user_agent_policy: Optional[AnyPolicy[HTTPRequestType, HTTPResponseType]] = None
 

sdk/core/generic-core/generic/core/exceptions.py

@@ -199,15 +199,14 @@ class HttpResponseError(ServiceError):
 
     :param object message: The message object stringified as 'message' attribute
     :param response: The response that triggered the exception.
-    :type response: ~generic.core.pipeline.transport.HttpResponse or ~generic.core.pipeline.transport.AsyncHttpResponse
+    :type response: ~generic.core.rest.HttpResponse or ~generic.core.rest.AsyncHttpResponse
 
     :ivar reason: The HTTP response reason
     :vartype reason: str
     :ivar status_code: HttpResponse's status code
     :vartype status_code: int
     :ivar response: The response that triggered the exception.
-    :vartype response: ~generic.core.pipeline.transport.HttpResponse or
-        ~generic.core.pipeline.transport.AsyncHttpResponse
+    :vartype response: ~generic.core.rest.HttpResponse or ~generic.core.rest.AsyncHttpResponse
     """
 
     def __init__(

sdk/core/generic-core/generic/core/pipeline/__init__.py

@@ -141,7 +141,7 @@ class PipelineRequest(Generic[HTTPRequestType]):
     Universal for all transports, both synchronous and asynchronous.
 
     :param http_request: The request object.
-    :type http_request: ~generic.core.pipeline.transport.HttpRequest
+    :type http_request: ~generic.core.rest.HttpRequest
     :param context: Contains the context - data persisted between pipeline requests.
     :type context: ~generic.core.pipeline.PipelineContext
     """
@@ -162,9 +162,9 @@ class PipelineResponse(Generic[HTTPRequestType, HTTPResponseType]):
     However, nothing prevents a policy to actually sub-class this class a return it instead of the initial instance.
 
     :param http_request: The request object.
-    :type http_request: ~generic.core.pipeline.transport.HttpRequest
+    :type http_request: ~generic.core.rest.HttpRequest
     :param http_response: The response object.
-    :type http_response: ~generic.core.pipeline.transport.HttpResponse
+    :type http_response: ~generic.core.rest.HttpResponse
     :param context: Contains the context - data persisted between pipeline requests.
     :type context: ~generic.core.pipeline.PipelineContext
     """

sdk/core/generic-core/generic/core/pipeline/_base.py

@@ -191,7 +191,7 @@ def prepare_requests(req):
 
     def _prepare_multipart(self, request: HTTPRequestType) -> None:
         # This code is fine as long as HTTPRequestType is actually
-        # generic.core.pipeline.transport.HTTPRequest, bu we don't check it in here
+        # generic.core.rest.HttpRequest, bu we don't check it in here
         # since we didn't see (yet) pipeline usage where it's not this actual instance
         # class used
         self._prepare_multipart_mixed_request(request)
@@ -201,7 +201,7 @@ def run(self, request: HTTPRequestType, **kwargs: Any) -> PipelineResponse[HTTPR
         """Runs the HTTP Request through the chained policies.
 
         :param request: The HTTP request object.
-        :type request: ~generic.core.pipeline.transport.HttpRequest
+        :type request: ~generic.core.rest.HttpRequest
         :return: The PipelineResponse object
         :rtype: ~generic.core.pipeline.PipelineResponse
         """

sdk/core/generic-core/generic/core/pipeline/_base_async.py

@@ -198,7 +198,7 @@ async def prepare_requests(req):
 
     async def _prepare_multipart(self, request: HTTPRequestType) -> None:
         # This code is fine as long as HTTPRequestType is actually
-        # generic.core.pipeline.transport.HTTPRequest, but we don't check it in here
+        # generic.core.rest.HttpRequest, but we don't check it in here
         # since we didn't see (yet) pipeline usage where it's not this actual instance
         # class used
         await self._prepare_multipart_mixed_request(request)
@@ -210,7 +210,7 @@ async def run(
         """Runs the HTTP Request through the chained policies.
 
         :param request: The HTTP request object.
-        :type request: ~generic.core.pipeline.transport.HttpRequest
+        :type request: ~generic.core.rest.HttpRequest
         :return: The PipelineResponse object.
         :rtype: ~generic.core.pipeline.PipelineResponse
         """

sdk/core/generic-core/generic/core/pipeline/_tools.py

@@ -24,11 +24,11 @@
 #
 # --------------------------------------------------------------------------
 from __future__ import annotations
-from typing import TYPE_CHECKING, Union, Callable, TypeVar, Dict
-from typing_extensions import TypeGuard, ParamSpec
+from typing import TYPE_CHECKING, Callable, TypeVar, Dict
+from typing_extensions import ParamSpec
 
 if TYPE_CHECKING:
-    from ..rest import HttpResponse, HttpRequest, AsyncHttpResponse
+    from ..rest import HttpResponse
 
 
 P = ParamSpec("P")
@@ -52,22 +52,6 @@ def await_result(func: Callable[P, T], *args: P.args, **kwargs: P.kwargs) -> T:
     return result
 
 
-def is_rest(obj: object) -> TypeGuard[Union[HttpRequest, HttpResponse, AsyncHttpResponse]]:
-    """Return whether a request or a response is a rest request / response.
-
-    Checking whether the response has the object content can sometimes result
-    in a ResponseNotRead error if you're checking the value on a response
-    that has not been read in yet. To get around this, we also have added
-    a check for is_stream_consumed, which is an exclusive property on our new responses.
-
-    :param obj: The object to check.
-    :type obj: any
-    :rtype: bool
-    :return: Whether the object is a rest request / response.
-    """
-    return hasattr(obj, "is_stream_consumed") or hasattr(obj, "content")
-
-
 def handle_non_stream_rest_response(response: HttpResponse) -> None:
     """Handle reading and closing of non stream rest responses.
     For our new rest responses, we have to call .read() and .close() for our non-stream

sdk/core/generic-core/generic/core/pipeline/policies/__init__.py

@@ -38,7 +38,6 @@
     NetworkTraceLoggingPolicy,
     ContentDecodePolicy,
     ProxyPolicy,
-    HttpLoggingPolicy,
     RequestIdPolicy,
 )
 from ._base_async import AsyncHTTPPolicy
@@ -62,7 +61,6 @@
     "ProxyPolicy",
     "DistributedTracingPolicy",
     "RequestHistory",
-    "HttpLoggingPolicy",
     "RequestIdPolicy",
     "AsyncHTTPPolicy",
     "AsyncBearerTokenCredentialPolicy",

sdk/core/generic-core/generic/core/pipeline/policies/_authentication.py

@@ -5,8 +5,8 @@
 # -------------------------------------------------------------------------
 import time
 from typing import TYPE_CHECKING, Optional, TypeVar, MutableMapping, Any
+
 from .. import PipelineRequest, PipelineResponse
-from ..transport import HttpResponse as LegacyHttpResponse, HttpRequest as LegacyHttpRequest
 from ...rest import HttpResponse, HttpRequest
 from . import HTTPPolicy, SansIOHTTPPolicy
 from ...exceptions import ServiceRequestError
@@ -19,8 +19,8 @@
         ServiceKeyCredential,
     )
 
-HTTPResponseType = TypeVar("HTTPResponseType", HttpResponse, LegacyHttpResponse)
-HTTPRequestType = TypeVar("HTTPRequestType", HttpRequest, LegacyHttpRequest)
+HTTPResponseType = TypeVar("HTTPResponseType", bound=HttpResponse)
+HTTPRequestType = TypeVar("HTTPRequestType", bound=HttpRequest)
 
 
 # pylint:disable=too-few-public-methods

sdk/core/generic-core/generic/core/pipeline/policies/_authentication_async.py

@@ -10,19 +10,15 @@
 from ...credentials import AccessToken
 from .. import PipelineRequest, PipelineResponse
 from .._base_async import AsyncHTTPPolicy
-from ._authentication import (
-    _BearerTokenCredentialPolicyBase,
-)
-from ..transport import AsyncHttpResponse as LegacyAsyncHttpResponse, HttpRequest as LegacyHttpRequest
+from ._authentication import _BearerTokenCredentialPolicyBase
 from ...rest import AsyncHttpResponse, HttpRequest
-
 from .._tools_async import await_result
 
 if TYPE_CHECKING:
     from ...credentials_async import AsyncTokenCredential
 
-AsyncHTTPResponseType = TypeVar("AsyncHTTPResponseType", AsyncHttpResponse, LegacyAsyncHttpResponse)
-HTTPRequestType = TypeVar("HTTPRequestType", HttpRequest, LegacyHttpRequest)
+AsyncHTTPResponseType = TypeVar("AsyncHTTPResponseType", bound=AsyncHttpResponse)
+HTTPRequestType = TypeVar("HTTPRequestType", bound=HttpRequest)
 
 
 class AsyncBearerTokenCredentialPolicy(AsyncHTTPPolicy[HTTPRequestType, AsyncHTTPResponseType]):

sdk/core/generic-core/generic/core/pipeline/policies/_base.py

@@ -128,9 +128,9 @@ class RequestHistory(Generic[HTTPRequestType, HTTPResponseType]):
     This is used to document requests/responses that resulted in redirected/retried requests.
 
     :param http_request: The request.
-    :type http_request: ~generic.core.pipeline.transport.HttpRequest
+    :type http_request: ~generic.core.rest.HttpRequest
     :param http_response: The HTTP response.
-    :type http_response: ~generic.core.pipeline.transport.HttpResponse
+    :type http_response: ~generic.core.rest.HttpResponse
     :param Exception error: An error encountered during the request, or None if the response was received successfully.
     :param dict context: The pipeline context.
     """

sdk/core/generic-core/generic/core/pipeline/policies/_distributed_tracing.py

@@ -32,7 +32,6 @@
 
 from .. import PipelineRequest, PipelineResponse
 from ..policies import SansIOHTTPPolicy
-from ..transport import HttpResponse as LegacyHttpResponse, HttpRequest as LegacyHttpRequest
 from ...rest import HttpResponse, HttpRequest
 from ...settings import settings
 from ...tracing import SpanKind
@@ -42,8 +41,8 @@
         AbstractSpan,
     )
 
-HTTPResponseType = TypeVar("HTTPResponseType", HttpResponse, LegacyHttpResponse)
-HTTPRequestType = TypeVar("HTTPRequestType", HttpRequest, LegacyHttpRequest)
+HTTPResponseType = TypeVar("HTTPResponseType", bound=HttpResponse)
+HTTPRequestType = TypeVar("HTTPRequestType", bound=HttpRequest)
 ExcInfo = Tuple[Type[BaseException], BaseException, TracebackType]
 OptExcInfo = Union[ExcInfo, Tuple[None, None, None]]
 
@@ -54,7 +53,7 @@ def _default_network_span_namer(http_request: HTTPRequestType) -> str:
     """Extract the path to be used as network span name.
 
     :param http_request: The HTTP request
-    :type http_request: ~generic.core.pipeline.transport.HttpRequest
+    :type http_request: ~generic.core.rest.HttpRequest
     :returns: The string to use as network span name
     :rtype: str
     """
@@ -68,14 +67,14 @@ class DistributedTracingPolicy(SansIOHTTPPolicy[HTTPRequestType, HTTPResponseTyp
     """The policy to create spans for service calls.
 
     :keyword network_span_namer: A callable to customize the span name
-    :type network_span_namer: callable[[~generic.core.pipeline.transport.HttpRequest], str]
+    :type network_span_namer: callable[[~generic.core.rest.HttpRequest], str]
     :keyword tracing_attributes: Attributes to set on all created spans
     :type tracing_attributes: dict[str, str]
     """
 
     TRACING_CONTEXT = "TRACING_CONTEXT"
-    _REQUEST_ID = "x-ms-client-request-id"
-    _RESPONSE_ID = "x-ms-request-id"
+    _REQUEST_ID = "x-client-request-id"
+    _RESPONSE_ID = "x-request-id"
 
     def __init__(self, **kwargs: Any):
         self._network_span_namer = kwargs.get("network_span_namer", _default_network_span_namer)
@@ -114,15 +113,15 @@ def end_span(
         :param request: The PipelineRequest object
         :type request: ~generic.core.pipeline.PipelineRequest
         :param response: The HttpResponse object
-        :type response: ~generic.core.rest.HTTPResponse or ~generic.core.pipeline.transport.HttpResponse
+        :type response: ~generic.core.rest.HTTPResponse or ~generic.core.rest.HttpResponse
         :param exc_info: The exception information
         :type exc_info: tuple
         """
         if self.TRACING_CONTEXT not in request.context:
             return
 
         span: "AbstractSpan" = request.context[self.TRACING_CONTEXT]
-        http_request: Union[HttpRequest, LegacyHttpRequest] = request.http_request
+        http_request: HttpRequest = request.http_request
         if span is not None:
             span.set_http_attributes(http_request, response=response)
             request_id = http_request.headers.get(self._REQUEST_ID)

sdk/core/generic-core/generic/core/pipeline/policies/_redirect.py

@@ -33,20 +33,13 @@
 
 from ...exceptions import TooManyRedirectsError
 from .. import PipelineResponse, PipelineRequest
-from ..transport import (
-    HttpResponse as LegacyHttpResponse,
-    HttpRequest as LegacyHttpRequest,
-    AsyncHttpResponse as LegacyAsyncHttpResponse,
-)
 from ...rest import HttpResponse, HttpRequest, AsyncHttpResponse
 from ._base import HTTPPolicy, RequestHistory
 from ._utils import get_domain
 
-HTTPResponseType = TypeVar("HTTPResponseType", HttpResponse, LegacyHttpResponse)
-AllHttpResponseType = TypeVar(
-    "AllHttpResponseType", HttpResponse, LegacyHttpResponse, AsyncHttpResponse, LegacyAsyncHttpResponse
-)
-HTTPRequestType = TypeVar("HTTPRequestType", HttpRequest, LegacyHttpRequest)
+HTTPResponseType = TypeVar("HTTPResponseType", bound=HttpResponse)
+AllHttpResponseType = TypeVar("AllHttpResponseType", HttpResponse, AsyncHttpResponse)
+HTTPRequestType = TypeVar("HTTPRequestType", bound=HttpRequest)
 ClsRedirectPolicy = TypeVar("ClsRedirectPolicy", bound="RedirectPolicyBase")
 
 _LOGGER = logging.getLogger(__name__)

sdk/core/generic-core/generic/core/pipeline/policies/_redirect_async.py

@@ -24,19 +24,16 @@
 #
 # --------------------------------------------------------------------------
 from typing import TypeVar
-from generic.core.exceptions import TooManyRedirectsError
-from generic.core.pipeline import PipelineResponse, PipelineRequest
-from generic.core.pipeline.transport import (
-    AsyncHttpResponse as LegacyAsyncHttpResponse,
-    HttpRequest as LegacyHttpRequest,
-)
-from generic.core.rest import AsyncHttpResponse, HttpRequest
+
 from . import AsyncHTTPPolicy
 from ._redirect import RedirectPolicyBase, domain_changed
 from ._utils import get_domain
+from .. import PipelineResponse, PipelineRequest
+from ...exceptions import TooManyRedirectsError
+from ...rest import AsyncHttpResponse, HttpRequest
 
-AsyncHTTPResponseType = TypeVar("AsyncHTTPResponseType", AsyncHttpResponse, LegacyAsyncHttpResponse)
-HTTPRequestType = TypeVar("HTTPRequestType", HttpRequest, LegacyHttpRequest)
+AsyncHTTPResponseType = TypeVar("AsyncHTTPResponseType", bound=AsyncHttpResponse)
+HTTPRequestType = TypeVar("HTTPRequestType", bound=HttpRequest)
 
 
 class AsyncRedirectPolicy(RedirectPolicyBase, AsyncHTTPPolicy[HTTPRequestType, AsyncHTTPResponseType]):