Author: momento-github-actions-machine-user

src/momento/auth_client.py

@@ -9,7 +9,7 @@
 from momento.config.auth_configuration import AuthConfiguration
 from momento.internal.synchronous._scs_token_client import _ScsTokenClient
 from momento.responses.auth.generate_disposable_token import GenerateDisposableTokenResponse
-from momento.utilities.expiration import ExpiresIn
+from momento.utilities import ExpiresIn
 
 
 class AuthClient:

src/momento/auth_client_async.py

@@ -9,7 +9,7 @@
 from momento.config.auth_configuration import AuthConfiguration
 from momento.internal.aio._scs_token_client import _ScsTokenClient
 from momento.responses.auth.generate_disposable_token import GenerateDisposableTokenResponse
-from momento.utilities.expiration import ExpiresIn
+from momento.utilities import ExpiresIn
 
 
 class AuthClientAsync:

src/momento/cache_client.py

@@ -8,10 +8,10 @@
 from momento.auth import CredentialProvider
 from momento.config import Configuration
 from momento.errors import UnknownException
+from momento.internal._utilities import _validate_eager_connection_timeout
 from momento.requests import CollectionTtl, SortOrder
 from momento.utilities.shared_sync_asyncio import (
     DEFAULT_EAGER_CONNECTION_TIMEOUT_SECONDS,
-    validate_eager_connection_timeout,
 )
 
 try:
@@ -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)

src/momento/cache_client_async.py

@@ -8,10 +8,10 @@
 from momento.auth import CredentialProvider
 from momento.config import Configuration
 from momento.errors import UnknownException
+from momento.internal._utilities import _validate_eager_connection_timeout
 from momento.requests import CollectionTtl, SortOrder
 from momento.utilities.shared_sync_asyncio import (
     DEFAULT_EAGER_CONNECTION_TIMEOUT_SECONDS,
-    validate_eager_connection_timeout,
 )
 
 try:
@@ -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)

src/momento/internal/_utilities/__init__.py

@@ -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,

src/momento/internal/_utilities/_data_validation.py

@@ -15,6 +15,7 @@
     TSortedSetElements,
     TSortedSetValues,
 )
+from momento.utilities import ExpiresIn
 
 DEFAULT_BYTES_CONVERSION_ERROR = "Could not convert the given type to bytes: "
 DEFAULT_LIST_CONVERSION_ERROR = "The given type is not list[str | bytes]: "
@@ -137,3 +138,17 @@ def _validate_request_timeout(request_timeout: Optional[timedelta]) -> None:
     if request_timeout is None:
         return
     _validate_timedelta_ttl(ttl=request_timeout, field_name="Request timeout")
+
+
+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:
+    if not expires_in.does_expire():
+        raise ValueError("Disposable tokens must have an expiry")
+    if expires_in.valid_for_seconds() < 0:
+        raise ValueError("Disposable token expiry must be positive")
+    if expires_in.valid_for_seconds() > 60 * 60:
+        raise ValueError("Disposable tokens must expire within 1 hour")

src/momento/internal/_utilities/_permissions.py

@@ -25,7 +25,7 @@
     TopicPermission,
     TopicRole,
 )
-from tests.utils import str_to_bytes
+from momento.utilities.shared_sync_asyncio import str_to_bytes
 
 
 class SuperuserPermissions(PredefinedScope):

src/momento/internal/aio/_scs_token_client.py

@@ -8,12 +8,12 @@
 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._permissions import permissions_from_disposable_token_scope
 from momento.internal.aio._scs_grpc_manager import _TokenGrpcManager
 from momento.internal.services import Service
 from momento.responses.auth.generate_disposable_token import GenerateDisposableToken, GenerateDisposableTokenResponse
-from momento.utilities.expiration import ExpiresIn
-from momento.utilities.shared_sync_asyncio import validate_disposable_token_expiry
+from momento.utilities import ExpiresIn
 
 
 class _ScsTokenClient:
@@ -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

src/momento/internal/synchronous/_scs_token_client.py

@@ -8,12 +8,12 @@
 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._permissions import permissions_from_disposable_token_scope
 from momento.internal.services import Service
 from momento.internal.synchronous._scs_grpc_manager import _TokenGrpcManager
 from momento.responses.auth.generate_disposable_token import GenerateDisposableToken, GenerateDisposableTokenResponse
-from momento.utilities.expiration import ExpiresIn
-from momento.utilities.shared_sync_asyncio import validate_disposable_token_expiry
+from momento.utilities import ExpiresIn
 
 
 class _ScsTokenClient:
@@ -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

src/momento/responses/auth/generate_disposable_token.py

@@ -8,7 +8,7 @@
 from momento_wire_types import token_pb2 as token_pb
 
 from momento.responses.response import AuthResponse
-from momento.utilities.expiration import ExpiresAt
+from momento.utilities import ExpiresAt
 
 from ..mixins import ErrorResponseMixin