Skip to content

Commit e59bf48

Browse files
Copilotbambriz
andcommitted
Refactor Constants structure: Make _InternalOptions and _Kwargs standalone classes with direct imports
- Extracted _InternalOptions and _Kwargs from nested _Constants classes to standalone classes - Updated all imports from `from ._constants import _Constants as Constants` + aliases to direct imports: `from ._constants import _InternalOptions, _Kwargs` - Removed all alias assignments like `_InternalOptions = Constants.InternalOptions` and `_Kwargs = Constants.Kwargs` - Applied changes across all sync and async files: - container.py / aio/_container.py - database.py / aio/_database.py - cosmos_client.py / aio/_cosmos_client.py - _cosmos_client_connection.py / aio/_cosmos_client_connection_async.py - _base.py, _request_object.py, _global_partition_endpoint_manager_circuit_breaker.py - Maintained backward compatibility with Constants access patterns - All syntax checks pass, imports work correctly Co-authored-by: bambriz <[email protected]>
1 parent 40e5cef commit e59bf48

13 files changed

+17
-63
lines changed

sdk/cosmos/azure-cosmos/azure/cosmos/_base.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
from . import documents
3939
from . import http_constants
4040
from . import _runtime_constants
41-
from ._constants import _Constants as Constants
41+
from ._constants import _Constants as Constants, _InternalOptions, _Kwargs
4242
from .auth import _get_authorization_header
4343
from .offer import ThroughputProperties
4444
from .partition_key import _Empty, _Undefined
@@ -48,12 +48,8 @@
4848
from .aio._cosmos_client_connection_async import CosmosClientConnection as AsyncClientConnection
4949
from ._request_object import RequestObject
5050

51-
# Shorter aliases for convenient usage
52-
_InternalOptions = Constants.InternalOptions
53-
_Kwargs = Constants.Kwargs
54-
5551
# InternalOptions alias for cleaner access to internal option constants
56-
InternalOptions = Constants.InternalOptions
52+
InternalOptions = _InternalOptions
5753

5854
# pylint: disable=protected-access
5955

sdk/cosmos/azure-cosmos/azure/cosmos/_constants.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ class _Constants:
102102
)
103103
}
104104

105-
class InternalOptions:
105+
106+
class _InternalOptions:
106107
"""Internal option names used in request processing
107108
108109
These constants represent the internal option keys used in the azure-cosmos package
@@ -269,7 +270,8 @@ class InternalOptions:
269270
MATCH_CONDITION: Final[str] = "matchCondition"
270271
"""Match condition for conditional operations."""
271272

272-
class Kwargs:
273+
274+
class _Kwargs:
273275
"""Public-facing keyword argument names used in the azure-cosmos package
274276
275277
These constants should be used instead of hardcoded strings for kwargs in public APIs

sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
from ._change_feed.change_feed_iterable import ChangeFeedIterable
6464
from ._change_feed.change_feed_state import ChangeFeedState
6565
from ._change_feed.feed_range_internal import FeedRangeInternalEpk
66-
from ._constants import _Constants as Constants
66+
from ._constants import _Constants as Constants, _InternalOptions, _Kwargs
6767
from ._cosmos_http_logging_policy import CosmosHttpLoggingPolicy
6868
from ._cosmos_responses import CosmosDict, CosmosList
6969
from ._range_partition_resolver import RangePartitionResolver
@@ -81,10 +81,6 @@
8181
_return_undefined_or_empty_partition_key,
8282
)
8383

84-
# Shorter aliases for convenient usage
85-
_InternalOptions = Constants.InternalOptions
86-
_Kwargs = Constants.Kwargs
87-
8884
class CredentialDict(TypedDict, total=False):
8985
masterKey: str
9086
resourceTokens: Mapping[str, Any]

sdk/cosmos/azure-cosmos/azure/cosmos/_global_partition_endpoint_manager_circuit_breaker.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"""
2424
from typing import TYPE_CHECKING, Optional
2525

26-
from azure.cosmos._constants import _Constants as Constants
26+
from azure.cosmos._constants import _Constants as Constants, _InternalOptions, _Kwargs
2727
from azure.cosmos.partition_key import _get_partition_key_from_partition_key_definition
2828
from azure.cosmos._global_partition_endpoint_manager_circuit_breaker_core import \
2929
_GlobalPartitionEndpointManagerForCircuitBreakerCore
@@ -36,10 +36,6 @@
3636
if TYPE_CHECKING:
3737
from azure.cosmos._cosmos_client_connection import CosmosClientConnection
3838

39-
# Shorter aliases for convenient usage
40-
_InternalOptions = Constants.InternalOptions
41-
_Kwargs = Constants.Kwargs
42-
4339
class _GlobalPartitionEndpointManagerForCircuitBreaker(_GlobalEndpointManager):
4440
"""
4541
This internal class implements the logic for partition endpoint management for

sdk/cosmos/azure-cosmos/azure/cosmos/_request_object.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@
2424
from typing import Optional, Mapping, Any, Dict, List
2525
from .documents import _OperationType
2626
from .http_constants import ResourceType
27-
from ._constants import _Constants as Constants
28-
29-
# Shorter aliases for convenient usage
30-
_InternalOptions = Constants.InternalOptions
31-
_Kwargs = Constants.Kwargs
27+
from ._constants import _Constants as Constants, _InternalOptions, _Kwargs
3228

3329
class RequestObject(object): # pylint: disable=too-many-instance-attributes
3430
def __init__(

sdk/cosmos/azure-cosmos/azure/cosmos/aio/_container.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
)
4747
from .._change_feed.feed_range_internal import FeedRangeInternalEpk
4848
from .._cosmos_responses import CosmosDict, CosmosList
49-
from .._constants import _Constants as Constants
49+
from .._constants import _Constants as Constants, _InternalOptions, _Kwargs
5050
from .._routing.routing_range import Range
5151
from .._session_token_helpers import get_latest_session_token
5252
from ..offer import ThroughputProperties
@@ -56,10 +56,6 @@
5656
_get_partition_key_from_partition_key_definition, NullPartitionKeyValue, _PartitionKeyType
5757
)
5858

59-
# Shorter aliases for convenient usage
60-
_InternalOptions = Constants.InternalOptions
61-
_Kwargs = Constants.Kwargs
62-
6359
__all__ = ("ContainerProxy",)
6460

6561
# pylint: disable=protected-access, too-many-lines

sdk/cosmos/azure-cosmos/azure/cosmos/aio/_cosmos_client.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,14 @@
3434
from azure.cosmos.offer import ThroughputProperties
3535

3636
from ..cosmos_client import _parse_connection_str
37-
from .._constants import _Constants as Constants
37+
from .._constants import _Constants as Constants, _InternalOptions, _Kwargs
3838
from ._cosmos_client_connection_async import CosmosClientConnection, CredentialDict
3939
from .._base import build_options as _build_options, _set_throughput_options
4040
from ._retry_utility_async import _ConnectionRetryPolicy
4141
from ._database import DatabaseProxy, _get_database_link
4242
from ..documents import ConnectionPolicy, DatabaseAccount
4343
from ..exceptions import CosmosResourceNotFoundError
4444

45-
# Shorter aliases for convenient usage
46-
_InternalOptions = Constants.InternalOptions
47-
_Kwargs = Constants.Kwargs
48-
4945
# pylint: disable=docstring-keyword-should-match-keyword-only
5046

5147
__all__ = ("CosmosClient",)

sdk/cosmos/azure-cosmos/azure/cosmos/aio/_cosmos_client_connection_async.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
from .._change_feed.feed_range_internal import FeedRangeInternalEpk
6161
from .._routing import routing_range
6262
from ..documents import ConnectionPolicy, DatabaseAccount
63-
from .._constants import _Constants as Constants
63+
from .._constants import _Constants as Constants, _InternalOptions, _Kwargs
6464
from .._cosmos_responses import CosmosDict, CosmosList
6565
from .. import http_constants, exceptions
6666
from . import _query_iterable_async as query_iterable
@@ -83,10 +83,6 @@
8383
from .._cosmos_http_logging_policy import CosmosHttpLoggingPolicy
8484
from .._range_partition_resolver import RangePartitionResolver
8585

86-
# Shorter aliases for convenient usage
87-
_InternalOptions = Constants.InternalOptions
88-
_Kwargs = Constants.Kwargs
89-
9086

9187

9288

sdk/cosmos/azure-cosmos/azure/cosmos/aio/_database.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
_deserialize_throughput,
3737
_replace_throughput
3838
)
39-
from .._constants import _Constants as Constants
39+
from .._constants import _Constants as Constants, _InternalOptions, _Kwargs
4040
from ._container import ContainerProxy
4141
from ..offer import ThroughputProperties
4242
from ..http_constants import StatusCodes
@@ -45,10 +45,6 @@
4545
from ..documents import IndexingMode
4646
from ..partition_key import PartitionKey
4747

48-
# Shorter aliases for convenient usage
49-
_InternalOptions = Constants.InternalOptions
50-
_Kwargs = Constants.Kwargs
51-
5248

5349
__all__ = ("DatabaseProxy",)
5450

sdk/cosmos/azure-cosmos/azure/cosmos/aio/_global_partition_endpoint_manager_circuit_breaker_async.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"""
2424
from typing import TYPE_CHECKING, Optional
2525

26-
from azure.cosmos._constants import _Constants as Constants
26+
from azure.cosmos._constants import _Constants as Constants, _InternalOptions, _Kwargs
2727

2828
from azure.cosmos.partition_key import _get_partition_key_from_partition_key_definition
2929
from azure.cosmos._global_partition_endpoint_manager_circuit_breaker_core import \
@@ -37,10 +37,6 @@
3737
if TYPE_CHECKING:
3838
from azure.cosmos.aio._cosmos_client_connection_async import CosmosClientConnection
3939

40-
# Shorter aliases for convenient usage
41-
_InternalOptions = Constants.InternalOptions
42-
_Kwargs = Constants.Kwargs
43-
4440
# pylint: disable=protected-access
4541
class _GlobalPartitionEndpointManagerForCircuitBreakerAsync(_GlobalEndpointManager):
4642
"""

0 commit comments

Comments
 (0)