Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move config into kwargs #7734

Merged
merged 11 commits into from
Oct 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions sdk/core/azure-core/azure/core/pipeline_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# --------------------------------------------------------------------------

import logging
from .configuration import Configuration
from .pipeline import Pipeline
from .pipeline.transport.base import PipelineClientBase
from .pipeline.policies import ContentDecodePolicy
Expand Down Expand Up @@ -59,20 +60,13 @@ class PipelineClient(PipelineClientBase):
Builds a Pipeline client.

:param str base_url: URL for the request.
:param config: Service configuration. This is a required parameter.
:type config: ~azure.core.Configuration
:param kwargs: keyword arguments
:keyword Configuration config: If omitted, the standard configuration is used.
:keyword Pipeline pipeline: If omitted, a Pipeline object is created and returned.
:keyword list[policy] policies: If omitted, the standard policies of the configuration object is used.
:keyword HttpTransport transport: If omitted, RequestsTransport is used for synchronous transport.
:return: A pipeline object.
:rtype: ~azure.core.pipeline.Pipeline

**Keyword arguments:**

*pipeline* - A Pipeline object. If omitted, a Pipeline object is created and returned.

*policies* - A list of policies object. If omitted, the standard policies of the configuration object is used.

*transport* - The HTTP Transport instance. If omitted, RequestsTransport is used for synchronous transport.

.. admonition:: Example:

.. literalinclude:: ../examples/test_example_sync.py
Expand All @@ -83,16 +77,14 @@ class PipelineClient(PipelineClientBase):
:caption: Builds the pipeline client.
"""

def __init__(self, base_url, config, **kwargs):
def __init__(self, base_url, **kwargs):
super(PipelineClient, self).__init__(base_url)
if config is None:
raise ValueError("Config is a required parameter")
self._config = config
self._config = kwargs.pop("config", None) or Configuration(**kwargs)
self._base_url = base_url
if kwargs.get("pipeline"):
self._pipeline = kwargs["pipeline"]
else:
self._pipeline = self._build_pipeline(config, **kwargs)
self._pipeline = self._build_pipeline(self._config, **kwargs)
bryevdv marked this conversation as resolved.
Show resolved Hide resolved

def __enter__(self):
self._pipeline.__enter__()
Expand Down
24 changes: 8 additions & 16 deletions sdk/core/azure-core/azure/core/pipeline_client_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# --------------------------------------------------------------------------

import logging
from .configuration import Configuration
from .pipeline import AsyncPipeline
from .pipeline.transport.base import PipelineClientBase
from .pipeline.policies import ContentDecodePolicy
Expand Down Expand Up @@ -58,20 +59,13 @@ class AsyncPipelineClient(PipelineClientBase):
Builds an AsyncPipeline client.

:param str base_url: URL for the request.
:param config: Service configuration. This is a required parameter.
:type config: ~azure.core.Configuration
:param kwargs: keyword arguments.
:keyword Configuration config: If omitted, the standard configuration is used.
:keyword Pipeline pipeline: If omitted, a Pipeline object is created and returned.
:keyword list[policy] policies: If omitted, the standard policies of the configuration object is used.
:keyword HttpTransport transport: If omitted, RequestsTransport is used for synchronous transport.
:return: An async pipeline object.
:rtype: ~azure.core.pipeline.AsyncPipeline

**Keyword arguments:**

*pipeline* - A Pipeline object. If omitted, an AsyncPipeline is created and returned.

*policies* - A list of policies object. If omitted, the standard policies of the configuration object is used.

*transport* - The HTTP Transport instance. If omitted, AioHttpTransport is use for asynchronous transport.

.. admonition:: Example:

.. literalinclude:: ../examples/test_example_async.py
Expand All @@ -82,16 +76,14 @@ class AsyncPipelineClient(PipelineClientBase):
:caption: Builds the async pipeline client.
"""

def __init__(self, base_url, config, **kwargs):
def __init__(self, base_url, **kwargs):
super(AsyncPipelineClient, self).__init__(base_url)
if config is None:
raise ValueError("Config is a required parameter")
self._config = config
self._config = kwargs.pop("config", None) or Configuration(**kwargs)
self._base_url = base_url
if kwargs.get("pipeline"):
self._pipeline = kwargs["pipeline"]
else:
self._pipeline = self._build_pipeline(config, **kwargs)
self._pipeline = self._build_pipeline(self._config, **kwargs)
bryevdv marked this conversation as resolved.
Show resolved Hide resolved

async def __aenter__(self):
await self._pipeline.__aenter__()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def __init__(
]

transport = kwargs.pop("transport", None)
self.pipeline_client = PipelineClient(url_connection, "empty-config", transport=transport, policies=policies)
self.pipeline_client = PipelineClient(base_url=url_connection, transport=transport, policies=policies)

# Query compatibility mode.
# Allows to specify compatibility mode used by client when making query requests. Should be removed when
Expand Down