Skip to content

Commit

Permalink
slight renaming and add validators to init file
Browse files Browse the repository at this point in the history
  • Loading branch information
anitarua committed Sep 23, 2024
1 parent 0ac70a4 commit e564f65
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/momento/cache_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from momento.auth import CredentialProvider
from momento.config import Configuration
from momento.errors import UnknownException
from momento.internal._utilities._data_validation import validate_eager_connection_timeout
from momento.internal._utilities._data_validation import _validate_eager_connection_timeout
from momento.requests import CollectionTtl, SortOrder
from momento.utilities.shared_sync_asyncio import (
DEFAULT_EAGER_CONNECTION_TIMEOUT_SECONDS,
Expand Down Expand Up @@ -206,7 +206,7 @@ def create(
eager_connection_timeout = timedelta(seconds=30)
client = CacheClient.create(configuration, credential_provider, ttl_seconds, eager_connection_timeout)
"""
validate_eager_connection_timeout(eager_connection_timeout)
_validate_eager_connection_timeout(eager_connection_timeout)
# an explicit 0 means that the client disabled eager connections
if eager_connection_timeout.total_seconds() != 0:
client = CacheClient(configuration, credential_provider, default_ttl)
Expand Down
4 changes: 2 additions & 2 deletions src/momento/cache_client_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from momento.auth import CredentialProvider
from momento.config import Configuration
from momento.errors import UnknownException
from momento.internal._utilities._data_validation import validate_eager_connection_timeout
from momento.internal._utilities._data_validation import _validate_eager_connection_timeout
from momento.requests import CollectionTtl, SortOrder
from momento.utilities.shared_sync_asyncio import (
DEFAULT_EAGER_CONNECTION_TIMEOUT_SECONDS,
Expand Down Expand Up @@ -207,7 +207,7 @@ async def create(
eager_connection_timeout = timedelta(seconds=30)
client = CacheClientAsync.create(configuration, credential_provider, ttl_seconds, eager_connection_timeout)
"""
validate_eager_connection_timeout(eager_connection_timeout)
_validate_eager_connection_timeout(eager_connection_timeout)
# an explicit 0 means that the client disabled eager connections
if eager_connection_timeout.total_seconds() != 0:
client = CacheClientAsync(configuration, credential_provider, default_ttl)
Expand Down
2 changes: 2 additions & 0 deletions src/momento/internal/_utilities/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
_gen_set_input_as_bytes,
_validate_cache_name,
_validate_dictionary_name,
_validate_disposable_token_expiry,
_validate_eager_connection_timeout,
_validate_list_name,
_validate_request_timeout,
_validate_set_name,
Expand Down
4 changes: 2 additions & 2 deletions src/momento/internal/_utilities/_data_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ def _validate_request_timeout(request_timeout: Optional[timedelta]) -> None:
_validate_timedelta_ttl(ttl=request_timeout, field_name="Request timeout")


def validate_eager_connection_timeout(timeout: timedelta) -> None:
def _validate_eager_connection_timeout(timeout: timedelta) -> None:
if timeout.total_seconds() < 0:
raise ValueError("The eager connection timeout must be greater than or equal to 0 seconds.")


def validate_disposable_token_expiry(expires_in: ExpiresIn) -> None:
def _validate_disposable_token_expiry(expires_in: ExpiresIn) -> None:
if not expires_in.does_expire():
raise ValueError("Disposable tokens must have an expiry")
if expires_in.valid_for_seconds() < 0:
Expand Down
4 changes: 2 additions & 2 deletions src/momento/internal/aio/_scs_token_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from momento.auth.credential_provider import CredentialProvider
from momento.config.auth_configuration import AuthConfiguration
from momento.errors.error_converter import convert_error
from momento.internal._utilities._data_validation import validate_disposable_token_expiry
from momento.internal._utilities._data_validation import _validate_disposable_token_expiry
from momento.internal._utilities._permissions import permissions_from_disposable_token_scope
from momento.internal.aio._scs_grpc_manager import _TokenGrpcManager
from momento.internal.services import Service
Expand Down Expand Up @@ -38,7 +38,7 @@ async def generate_disposable_token(
disposable_token_props: Optional[DisposableTokenProps] = None,
) -> GenerateDisposableTokenResponse:
try:
validate_disposable_token_expiry(expires_in)
_validate_disposable_token_expiry(expires_in)
self._logger.info("Creating disposable token")

token_id = disposable_token_props.token_id if disposable_token_props else None
Expand Down
4 changes: 2 additions & 2 deletions src/momento/internal/synchronous/_scs_token_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from momento.auth.credential_provider import CredentialProvider
from momento.config.auth_configuration import AuthConfiguration
from momento.errors.error_converter import convert_error
from momento.internal._utilities._data_validation import validate_disposable_token_expiry
from momento.internal._utilities._data_validation import _validate_disposable_token_expiry
from momento.internal._utilities._permissions import permissions_from_disposable_token_scope
from momento.internal.services import Service
from momento.internal.synchronous._scs_grpc_manager import _TokenGrpcManager
Expand Down Expand Up @@ -38,7 +38,7 @@ def generate_disposable_token(
disposable_token_props: Optional[DisposableTokenProps] = None,
) -> GenerateDisposableTokenResponse:
try:
validate_disposable_token_expiry(expires_in)
_validate_disposable_token_expiry(expires_in)
self._logger.info("Creating disposable token")

token_id = disposable_token_props.token_id if disposable_token_props else None
Expand Down

0 comments on commit e564f65

Please sign in to comment.