qwak-core 0.4.421__py3-none-any.whl → 0.5.1__py3-none-any.whl

qwak/__init__.py

@@ -1,7 +1,7 @@
 """Top-level package for qwak-core."""
 
 __author__ = "Qwak.ai"
-__version__ = "0.4.421"
+__version__ = "0.5.1"
 
 from qwak.inner.di_configuration import wire_dependencies
 from qwak.model.experiment_tracking import log_metric, log_param

qwak/exceptions/__init__.py

@@ -1,6 +1,7 @@
 from .quiet_error import QuietError
 from .qwak_exception import QwakException
 from .qwak_general_build_exception import QwakGeneralBuildException
+from .qwak_grpc_address_exception import QwakGrpcAddressException
 from .qwak_http_exception import QwakHTTPException
 from .qwak_inference_exception import QwakInferenceException
 from .qwak_load_configuration_exception import LoadConfigurationException

qwak/exceptions/qwak_grpc_address_exception.py

@@ -0,0 +1,9 @@
+from typing import Union
+from urllib.parse import ParseResult
+
+from qwak.exceptions import QwakException
+
+
+class QwakGrpcAddressException(QwakException):
+    def __init__(self, details: str, grpc_address: Union[str, ParseResult]):
+        self.message = f"Not a valid gRPC address: '{grpc_address}'. Details: {details}"

qwak/inner/const.py

@@ -33,10 +33,6 @@ class QwakConstants:
 
     TOKEN_AUDIENCE: str = "https://auth-token.qwak.ai/"  # nosec B105
 
-    QWAK_AUTHENTICATION_URL = "https://grpc.qwak.ai/api/v1/authentication/qwak-api-key"
-
-    QWAK_AUTHENTICATED_USER_ENDPOINT: str = (
-        "https://grpc.qwak.ai/api/v0/runtime/get-authenticated-user-context"
-    )
-
     QWAK_APP_URL: str = "https://app.qwak.ai"
+
+    CONTROL_PLANE_GRPC_ADDRESS_ENVAR_NAME: str = "CONTROL_PLANE_GRPC_ADDRESS"

qwak/inner/di_configuration/__init__.py

@@ -1,69 +1,3 @@
-import os
-
 from .account import UserAccountConfiguration
 from .containers import QwakContainer
-
-
-def wire_dependencies():
-    container = QwakContainer()
-
-    default_config_file = os.path.join(os.path.dirname(__file__), "config.yml")
-    container.config.from_yaml(default_config_file)
-
-    from qwak.clients import (
-        administration,
-        alert_management,
-        alerts_registry,
-        analytics,
-        audience,
-        automation_management,
-        autoscaling,
-        batch_job_management,
-        build_orchestrator,
-        data_versioning,
-        deployment,
-        feature_store,
-        file_versioning,
-        instance_template,
-        integration_management,
-        kube_deployment_captain,
-        logging_client,
-        model_management,
-        project,
-        prompt_manager,
-        system_secret,
-        user_application_instance,
-        vector_store,
-        workspace_manager,
-    )
-
-    container.wire(
-        packages=[
-            administration,
-            alert_management,
-            audience,
-            automation_management,
-            autoscaling,
-            analytics,
-            batch_job_management,
-            build_orchestrator,
-            data_versioning,
-            deployment,
-            file_versioning,
-            instance_template,
-            kube_deployment_captain,
-            logging_client,
-            model_management,
-            project,
-            feature_store,
-            user_application_instance,
-            alerts_registry,
-            workspace_manager,
-            vector_store,
-            integration_management,
-            system_secret,
-            prompt_manager,
-        ]
-    )
-
-    return container
+from .dependency_wiring import wire_dependencies

qwak/inner/di_configuration/dependency_wiring.py

@@ -0,0 +1,98 @@
+import os
+from pathlib import Path
+from typing import Optional
+
+from qwak.inner.const import QwakConstants
+from qwak.inner.di_configuration import QwakContainer
+from qwak.inner.tool.grpc.grpc_tools import validate_grpc_address
+from qwak.tools.logger import get_qwak_logger
+
+
+logger = get_qwak_logger()
+
+__DEFAULT_CONFIG_FILE_PATH: Path = Path(__file__).parent / "config.yml"
+
+
+def wire_dependencies():
+    container = QwakContainer()
+
+    container.config.from_yaml(__DEFAULT_CONFIG_FILE_PATH)
+    control_plane_grpc_address_override: Optional[str] = os.getenv(
+        QwakConstants.CONTROL_PLANE_GRPC_ADDRESS_ENVAR_NAME
+    )
+
+    if control_plane_grpc_address_override:
+        validate_grpc_address(control_plane_grpc_address_override)
+        __override_control_plane_grpc_address(
+            container, control_plane_grpc_address_override
+        )
+
+    from qwak.clients import (
+        administration,
+        alert_management,
+        alerts_registry,
+        analytics,
+        audience,
+        automation_management,
+        autoscaling,
+        batch_job_management,
+        build_orchestrator,
+        data_versioning,
+        deployment,
+        feature_store,
+        file_versioning,
+        instance_template,
+        integration_management,
+        kube_deployment_captain,
+        logging_client,
+        model_management,
+        project,
+        prompt_manager,
+        system_secret,
+        user_application_instance,
+        vector_store,
+        workspace_manager,
+    )
+
+    container.wire(
+        packages=[
+            administration,
+            alert_management,
+            audience,
+            automation_management,
+            autoscaling,
+            analytics,
+            batch_job_management,
+            build_orchestrator,
+            data_versioning,
+            deployment,
+            file_versioning,
+            instance_template,
+            kube_deployment_captain,
+            logging_client,
+            model_management,
+            project,
+            feature_store,
+            user_application_instance,
+            alerts_registry,
+            workspace_manager,
+            vector_store,
+            integration_management,
+            system_secret,
+            prompt_manager,
+        ]
+    )
+
+    return container
+
+
+def __override_control_plane_grpc_address(
+    container: "QwakContainer", control_plane_grpc_address_override: str
+):
+    logger.debug(
+        "Overriding control plane gRPC address from environment variable to %s.",
+        control_plane_grpc_address_override,
+    )
+    container.config.grpc.core.address.from_value(
+        control_plane_grpc_address_override.strip()
+    )

qwak/inner/tool/grpc/grpc_tools.py

@@ -1,15 +1,18 @@
 import logging
+import re
 import time
 from abc import ABC, abstractmethod
 from random import randint
 from typing import Callable, Optional, Tuple
+from urllib.parse import urlparse, ParseResult
 
 import grpc
-from qwak.exceptions import QwakException
 
+from qwak.exceptions import QwakException, QwakGrpcAddressException
 from .grpc_auth import Auth0Client
 
 logger = logging.getLogger()
+HOSTNAME_REGEX: str = r"^(?!-)(?:[A-Za-z0-9-]{1,63}\.)*[A-Za-z0-9-]{1,63}(?<!-)$"
 
 
 def create_grpc_channel(
@@ -19,7 +22,7 @@ def create_grpc_channel(
     auth_metadata_plugin: grpc.AuthMetadataPlugin = None,
     timeout: int = 100,
     options=None,
-    backoff_options={},
+    backoff_options=None,
     max_attempts=4,
     status_for_retry=(grpc.StatusCode.UNAVAILABLE,),
     attempt=0,
@@ -40,6 +43,9 @@ def create_grpc_channel(
         status_for_retry: grpc statuses to retry upon
     Returns: Returns a grpc.Channel
     """
+    if backoff_options is None:
+        backoff_options = {}
+
     if not url:
         raise QwakException("Unable to create gRPC channel. URL has not been defined.")
 
@@ -101,11 +107,14 @@ def create_grpc_channel_or_none(
     auth_metadata_plugin: grpc.AuthMetadataPlugin = None,
     timeout: int = 30,
     options=None,
-    backoff_options={},
+    backoff_options=None,
     max_attempts=2,
     status_for_retry=(grpc.StatusCode.UNAVAILABLE,),
     attempt=0,
 ) -> Callable[[Optional[str], Optional[bool]], Optional[grpc.Channel]]:
+    if backoff_options is None:
+        backoff_options = {}
+
     def deferred_channel(
         url_overwrite: Optional[str] = None, ssl_overwrite: Optional[bool] = None
     ):
@@ -129,6 +138,117 @@ def create_grpc_channel_or_none(
     return deferred_channel
 
 
+def validate_grpc_address(
+    grpc_address: str,
+    is_port_specification_allowed: bool = False,
+    is_url_scheme_allowed: bool = False,
+):
+    """
+    Validate gRPC address format
+    Args:
+        grpc_address (str): gRPC address to validate
+        is_port_specification_allowed (bool): Whether to allow port specification in the address
+        is_url_scheme_allowed (bool): Whether to allow URL scheme in the address
+    Raises:
+        QwakGrpcAddressException: If the gRPC address is invalid
+    """
+    parsed_grpc_address: ParseResult = parse_address(grpc_address)
+    hostname: str = get_hostname_from_address(parsed_grpc_address)
+    validate_paths_are_not_included_in_address(parsed_grpc_address)
+
+    if not is_url_scheme_allowed:
+        __validate_url_scheme_not_included_in_address(parsed_grpc_address)
+
+    if not is_port_specification_allowed:
+        __validate_port_not_included_in_address(parsed_grpc_address)
+
+    if not is_valid_hostname(hostname):
+        raise QwakGrpcAddressException(
+            "gRPC address must be a simple hostname or fully qualified domain name.",
+            parsed_grpc_address,
+        )
+
+
+def validate_paths_are_not_included_in_address(
+    parsed_grpc_address: ParseResult,
+) -> None:
+    has_invalid_path: bool = (
+        parsed_grpc_address.path not in {"", "/"}
+        or parsed_grpc_address.query
+        or parsed_grpc_address.fragment
+    )
+
+    if has_invalid_path:
+        raise QwakGrpcAddressException(
+            "gRPC address must not contain paths, queries, or fragments.",
+            parsed_grpc_address,
+        )
+
+
+def get_hostname_from_address(parsed_grpc_address: ParseResult) -> str:
+    hostname: Optional[str] = parsed_grpc_address.hostname
+    if not hostname:
+        raise QwakGrpcAddressException(
+            "gRPC address must contain a valid hostname.", parsed_grpc_address
+        )
+
+    return hostname
+
+
+def __validate_url_scheme_not_included_in_address(
+    parsed_grpc_address: ParseResult,
+) -> None:
+    if parsed_grpc_address.scheme:
+        raise QwakGrpcAddressException(
+            "URL scheme is not allowed in the gRPC address.", parsed_grpc_address
+        )
+
+
+def __validate_port_not_included_in_address(parsed_grpc_address: ParseResult):
+    try:
+        port: Optional[int] = parsed_grpc_address.port
+    except ValueError as exc:
+        raise QwakGrpcAddressException(
+            "Invalid port specification in the gRPC address.", parsed_grpc_address
+        ) from exc
+
+    if port:
+        raise QwakGrpcAddressException(
+            "Port specification is not allowed in the gRPC address.",
+            parsed_grpc_address,
+        )
+
+
+def parse_address(grpc_address: str) -> ParseResult:
+    if not grpc_address or not grpc_address.strip():
+        raise QwakGrpcAddressException(
+            "gRPC address must not be empty or whitespace.", grpc_address
+        )
+
+    trimmed_address: str = grpc_address.strip()
+    parsed_address: ParseResult = urlparse(
+        trimmed_address if "://" in trimmed_address else f"//{trimmed_address}"
+    )
+
+    return parsed_address
+
+
+def is_valid_hostname(hostname: str) -> bool:
+    """
+    Validate that the supplied hostname conforms to RFC-style label rules:
+    anchored pattern enforces full-string validation, negative lookahead/lookbehind block
+    leading or trailing hyphens per label, and each dot-separated label must be 1-63
+    alphanumeric/hyphen characters.
+
+    Args:
+        hostname (str): The hostname to validate.
+    Returns:
+        bool: True if the hostname is valid, False otherwise.
+    """
+    hostname_pattern: re.Pattern = re.compile(HOSTNAME_REGEX)
+    return bool(hostname_pattern.fullmatch(hostname))
+
+
 class SleepingPolicy(ABC):
     @abstractmethod
     def sleep(self, try_i: int):

{qwak_core-0.4.421.dist-info → qwak_core-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qwak-core
-Version: 0.4.421
+Version: 0.5.1
 Summary: Qwak Core contains the necessary objects and communication tools for using the Qwak Platform
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model
@@ -13,8 +13,6 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Provides-Extra: feature-store

{qwak_core-0.4.421.dist-info → qwak_core-0.5.1.dist-info}/RECORD

@@ -622,7 +622,7 @@ _qwak_proto/qwak/workspace/workspace_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXH
 _qwak_proto/qwak/workspace/workspace_service_pb2.py,sha256=93uNm83VVrkLG_XVsuBOBTPs4UJF91YD1xJTOEbRyig,9239
 _qwak_proto/qwak/workspace/workspace_service_pb2.pyi,sha256=nKKCHwnovZhsy8TSVmdz-Vtl0nviOOoX56HD-41Xo08,13726
 _qwak_proto/qwak/workspace/workspace_service_pb2_grpc.py,sha256=yKGuexxTBza99Ihe0DSTniV2ZSd_AG47inHenqfi890,27193
-qwak/__init__.py,sha256=cfo2Bof0rQ6rnlNNg87j7QogDSkxq8em0rZ8Z70FIlg,587
+qwak/__init__.py,sha256=IJF_zaEJ8xUOXZeFHO7OOrwN9Oe_vJV8SrOXqof8TYE,585
 qwak/automations/__init__.py,sha256=qFZRvCxUUn8gcxkJR0v19ulHW2oJ0x6-Rif7HiheDP4,1522
 qwak/automations/automation_executions.py,sha256=5MeH_epYYWb8NKXgAozwT_jPyyUDednBHG7izloi7RY,3228
 qwak/automations/automations.py,sha256=2Wyrgj2mW5VmJzTKAXj3vQM_svYCuq_Bsu3_Vu9SdR4,12732
@@ -711,12 +711,13 @@ qwak/clients/vector_store/management_client.py,sha256=EiO6B-zO0ETgL0VonWJZnigqpF
 qwak/clients/vector_store/serving_client.py,sha256=hl9B5Rr3fvCN12gCI6amlNoUll7sxT8rUE0a_JqhEHs,5293
 qwak/clients/workspace_manager/__init__.py,sha256=sJ_tnt-CqjXVVNlcywmyQ5L3n5Dk0uMDNjSVvEwHziA,43
 qwak/clients/workspace_manager/client.py,sha256=KXoipmYmzKTS1-auStjbZ7JKzXdCyHHqk22Q7KnrgV4,8136
-qwak/exceptions/__init__.py,sha256=GsyscKOIg1nwYCJz5MhpF5iKPyNyAR1NI2VtQf2OEus,790
+qwak/exceptions/__init__.py,sha256=RgGCJgUvVbNm9Z_Kxnu3YUiI877LcqdMv7mJVtDxqYg,856
 qwak/exceptions/quiet_error.py,sha256=ePdCGP6ta8afjzprMiGoJFY-gxf8albRwuY0t1WF2lY,559
 qwak/exceptions/qwak_decode_exception.py,sha256=-Fgh3sc7iFEmhXTYJ1X5GFDvA32yRqTR2owgiYyDHbc,149
 qwak/exceptions/qwak_exception.py,sha256=w4kmvUVy3VLroDzFxYE112s6Vd4oJuchStemhw4qMCg,192
 qwak/exceptions/qwak_external_exception.py,sha256=i1-9D7uVHinkUhdKEBWEHi287dmVF5PgJaFq23ZGSI8,251
 qwak/exceptions/qwak_general_build_exception.py,sha256=dKJo9t0OGSOrZNBsLOibkTAmV3mGzXf-C3wRQaDphqc,424
+qwak/exceptions/qwak_grpc_address_exception.py,sha256=MUSn3eP8z81KKDhb5Fe_888vGz8b1RndS79ulHuHI5o,320
 qwak/exceptions/qwak_http_exception.py,sha256=U1tlEFBp6BD5eICtATI8iCl4UJhVVFN2AWhWK-xbvoc,579
 qwak/exceptions/qwak_inference_exception.py,sha256=wvVQDf_saQt0FucWyVPI-lsz90OCbT-WqcB77_DzhU0,100
 qwak/exceptions/qwak_load_configuration_exception.py,sha256=rTs4lkgZbLYysgVBYt1Xi2i0GGSOFunen0oMpULYfdU,54
@@ -863,11 +864,12 @@ qwak/inner/build_logic/tools/files.py,sha256=druKkTp640Zy3x1MLjuTuXY56r5blEnH8dS
 qwak/inner/build_logic/tools/ignore_files.py,sha256=E65s3m46pmSX4q4hX2-R5HYHDO4VCQHjip8Xn_yOBRg,750
 qwak/inner/build_logic/tools/text.py,sha256=tH-v19Mt8l90sMVxku5XRtrderT0qdRqJ-jLijqannA,188
 qwak/inner/build_logic/trigger_build_context.py,sha256=n5s7MRk41h8cxPI3IVuqMQUVuCc-D8A7Hhq35YuuAps,200
-qwak/inner/const.py,sha256=x4QzsCKr80c7CfYI2TkgIVdvX7vKrTq3mmHp7GFVF34,1131
-qwak/inner/di_configuration/__init__.py,sha256=_QzRdBIKha032PIx5qqJ2bI6K1Z7ceAqVUXmBJtXvJ8,1709
+qwak/inner/const.py,sha256=H441szDAQsTBxCVWtk9HuawgZdPZkLFJRW6pxn1j5WM,991
+qwak/inner/di_configuration/__init__.py,sha256=RxGaowPAmq-entRtvlp2Ln6uc08wD0TTFwnTr7cr5zI,133
 qwak/inner/di_configuration/account.py,sha256=V5NOVOsxhe11-oD4i4UFskWMhq0EOyJ0rDbNSAv7GfA,5338
 qwak/inner/di_configuration/config.yml,sha256=GUvaZMWIDIR_d7hFcPVG_kHdCwpERKH1AFDakG3vqI4,242
 qwak/inner/di_configuration/containers.py,sha256=dK-cfd8ajT6yujlEhPhcRYB-avdYDcreQz_2kTIVDRQ,1252
+qwak/inner/di_configuration/dependency_wiring.py,sha256=5T9kJ26MBnzuJxUYlj3Q9JKUptevQeHSuxuwdq6UNBE,2659
 qwak/inner/di_configuration/session.py,sha256=Pwqapcu-0dsbb5dDn7ZGewVk4bYRN9sWk6ity72IDqY,452
 qwak/inner/instance_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak/inner/instance_template/verify_template_id.py,sha256=-c0Fh89XAfphKCpkurYaD-YyX3M3NkkpSLH4QsNPyko,1916
@@ -880,7 +882,7 @@ qwak/inner/tool/__init__.py,sha256=DDoMZk7LIZNfu63Ft0mLE5wflwlQoghAJ1ZmMAcAeVE,7
 qwak/inner/tool/auth.py,sha256=_78ufvtkNQ3ogcFwkotVySZgdS1yMTuIDMLOBsICkSU,4483
 qwak/inner/tool/grpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak/inner/tool/grpc/grpc_auth.py,sha256=_DvwaRruUu12l4K6ACvmzsTbIDlKl1kuKjm-ustQ5ns,1139
-qwak/inner/tool/grpc/grpc_tools.py,sha256=lY7SkXnnE0MrZOCFmg2KZZ5iZ7YJu_Z5F-R-6ezm4cU,6897
+qwak/inner/tool/grpc/grpc_tools.py,sha256=XReEerN5bVh1JlDwxFx6Ea-gBecGnkesQnuYlzpyGGQ,10880
 qwak/inner/tool/grpc/grpc_try_wrapping.py,sha256=4RScvo2jiCr5XwZvaH516OJWqbMSxC8MWIarrD-5HnA,5654
 qwak/inner/tool/protobuf_factory.py,sha256=ar_oY38w_x0sxgVF7EBs5h7gchNsDntvtKK5sSYxb24,1686
 qwak/inner/tool/retry_utils.py,sha256=KcSFJuj02RKF-H9INpCmdiTNXlywEMJ2ClBa00N9aNM,435
@@ -1095,6 +1097,6 @@ qwak_services_mock/mocks/workspace_manager_service_mock.py,sha256=O9ZSwln4T4kHVk
 qwak_services_mock/services_mock.py,sha256=0BWwS2re9ryO3JrJJgSNyEQ0lDOjyrpV36oa8t7Pd7A,19163
 qwak_services_mock/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_services_mock/utils/service_utils.py,sha256=ZlB0CnB1J6oBn6_m7fQO2U8tKoboHdUa6ljjkRMYNXU,265
-qwak_core-0.4.421.dist-info/METADATA,sha256=_ViMSOvXnNorMUW-MG2CJRT4gv55imtoeKwr8sq2pGI,2088
-qwak_core-0.4.421.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-qwak_core-0.4.421.dist-info/RECORD,,
+qwak_core-0.5.1.dist-info/METADATA,sha256=fNbPCLMekmre18dEbbWH8g4vmyW1ex5Xk43QI0yUlbk,1986
+qwak_core-0.5.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+qwak_core-0.5.1.dist-info/RECORD,,