qwak-core 0.4.362__py3-none-any.whl → 0.5.4__py3-none-any.whl

qwak/inner/tool/auth.py

@@ -1,12 +1,9 @@
 import warnings
 from filelock import FileLock
-from typing_extensions import Self
 
 from qwak.inner.di_configuration.session import Session
 from abc import ABC, abstractmethod
 from typing import Optional
-from frogml_storage.authentication.utils import get_credentials
-from frogml_storage.authentication.models import AuthConfig
 
 warnings.filterwarnings(action="ignore", module=".*jose.*")
 
@@ -140,86 +137,3 @@ class Auth0ClientBase(BaseAuthClient):
             raise e
         except Exception:
             raise QwakLoginException()
-
-
-class FrogMLAuthClient(BaseAuthClient):
-    __MIN_TOKEN_LENGTH: int = 64
-
-    def __init__(self, auth_config: Optional[AuthConfig] = None):
-        self.auth_config = auth_config
-        self._token = None
-        self._tenant_id = None
-
-    def get_token(self) -> Optional[str]:
-        if not self._token:
-            self.login()
-        return self._token
-
-    def get_tenant_id(self) -> Optional[str]:
-        if not self._tenant_id:
-            self.login()
-        return self._tenant_id
-
-    def get_base_url(self) -> str:
-        artifactory_url, _ = get_credentials(self.auth_config)
-        return self.__format_artifactory_url(artifactory_url)
-
-    def login(self) -> None:
-        artifactory_url, auth = get_credentials(self.auth_config)
-        # For now, we only support Bearer token authentication
-        if not hasattr(auth, "token"):
-            return
-
-        # noinspection PyUnresolvedReferences
-        self._token = auth.token
-        self.__validate_token()
-
-        base_url = self.__format_artifactory_url(artifactory_url)
-        try:
-            response = requests.get(
-                f"{base_url}/ui/api/v1/system/auth/screen/footer",
-                headers={"Authorization": f"Bearer {self._token}"},
-                timeout=60,
-            )
-            response.raise_for_status()  # Raises an HTTPError for bad responses
-            response_data = response.json()
-            if "serverId" not in response_data:
-                response = requests.get(
-                    f"{base_url}/jfconnect/api/v1/system/jpd_id",
-                    headers={"Authorization": f"Bearer {self._token}"},
-                    timeout=60,
-                )
-                if response.status_code == 200:
-                    self._tenant_id = response.text
-                elif response.status_code == 401:
-                    raise QwakLoginException(
-                        "Failed to authenticate with JFrog. Please check your credentials"
-                    )
-                else:
-                    raise QwakLoginException(
-                        "Failed to authenticate with JFrog. Please check your artifactory configuration"
-                    )
-            else:
-                self._tenant_id = response_data["serverId"]
-        except requests.exceptions.RequestException:
-            raise QwakLoginException(
-                "Failed to authenticate with JFrog. Please check your artifactory configuration"
-            )
-        except ValueError:  # This catches JSON decode errors
-            raise QwakLoginException(
-                "Failed to authenticate with JFrog. Please check your artifactory configuration"
-            )
-
-    def __validate_token(self: Self):
-        if self._token is None or len(self._token) <= self.__MIN_TOKEN_LENGTH:
-            raise QwakLoginException(
-                "Authentication with JFrog failed: Only JWT Access Tokens are supported. "
-                "Please ensure you are using a valid JWT Access Token."
-            )
-
-    @staticmethod
-    def __format_artifactory_url(artifactory_url: str) -> str:
-        # Remove '/artifactory' from the URL
-        base_url: str = artifactory_url.replace("/artifactory", "")
-        # Remove trailing slash if exists
-        return base_url.rstrip("/")

qwak/inner/tool/grpc/grpc_auth.py

@@ -1,7 +1,6 @@
 from typing import Callable, Tuple
 
 import grpc
-from qwak.inner.const import QwakConstants
 
 _SIGNATURE_HEADER_KEY = "authorization"
 
@@ -35,34 +34,3 @@ class Auth0Client(grpc.AuthMetadataPlugin):
 
             self._auth_client = Auth0ClientBase()
         return self._auth_client.get_token()
-
-
-class FrogMLGrpcClient(grpc.AuthMetadataPlugin):
-    def __init__(self):
-        self._auth_client = None
-
-    def __call__(
-        self,
-        context: grpc.AuthMetadataContext,
-        callback: Callable[[Tuple[Tuple[str, str]], None], None],
-    ):
-        """Implements authentication by passing metadata to a callback.
-
-        Args:
-            context: An AuthMetadataContext providing information on the RPC that
-                the plugin is being called to authenticate.
-            callback: A callback that accepts a tuple of metadata key/value pairs and a None
-                parameter.
-        """
-        # Get token from FrogML client
-        if not self._auth_client:
-            from qwak.inner.tool.auth import FrogMLAuthClient
-
-            self._auth_client = FrogMLAuthClient()
-        token = self._auth_client.get_token()
-        jfrog_tenant_id = self._auth_client.get_tenant_id()
-        metadata = (
-            (_SIGNATURE_HEADER_KEY, f"Bearer {token}"),
-            (QwakConstants.JFROG_TENANT_HEADER_KEY.lower(), jfrog_tenant_id),
-        )
-        callback(metadata, None)

qwak/inner/tool/grpc/grpc_tools.py

@@ -1,17 +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.inner.di_configuration.account import UserAccountConfiguration
-from qwak.inner.tool.auth import Auth0ClientBase
 
-from .grpc_auth import Auth0Client, FrogMLGrpcClient
+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(
@@ -21,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,
@@ -42,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.")
 
@@ -49,11 +53,7 @@ def create_grpc_channel(
         credentials = grpc.ssl_channel_credentials()
         if enable_auth:
             if auth_metadata_plugin is None:
-                user_config = UserAccountConfiguration()
-                if issubclass(user_config._auth_client, Auth0ClientBase):
-                    auth_metadata_plugin = Auth0Client()
-                else:
-                    auth_metadata_plugin = FrogMLGrpcClient()
+                auth_metadata_plugin = Auth0Client()
             credentials = grpc.composite_channel_credentials(
                 credentials, grpc.metadata_call_credentials(auth_metadata_plugin)
             )
@@ -107,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
     ):
@@ -135,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/inner/tool/grpc/grpc_try_wrapping.py

@@ -1,12 +1,14 @@
+import logging
 import functools
 import inspect
 from inspect import BoundArguments, Signature
 from typing import Any, Callable, Optional
 
 import grpc
-from frogml_storage.logging import logger
 from qwak.exceptions import QwakException
 
+logger = logging.getLogger()
+
 
 def grpc_try_catch_wrapper(
     exception_message: str,

qwak/llmops/generation/chat/openai/types/chat/chat_completion.py

@@ -16,8 +16,6 @@
 from dataclasses import dataclass
 from typing import List, Optional
 
-from typing_extensions import Literal
-
 from qwak.llmops.generation.base import ModelResponse
 from .chat_completion_message import ChatCompletionMessage
 from .chat_completion_token_logprob import ChatCompletionTokenLogprob
@@ -34,9 +32,7 @@ class ChoiceLogprobs:
 
 @dataclass
 class Choice:
-    finish_reason: Literal[
-        "stop", "length", "tool_calls", "content_filter", "function_call"
-    ]
+    finish_reason: str
     """The reason the model stopped generating tokens.
 
     This will be `stop` if the model hit a natural stop point or a provided stop
@@ -55,6 +51,21 @@ class Choice:
     logprobs: Optional[ChoiceLogprobs] = None
     """Log probability information for the choice."""
 
+    def __post_init__(self):
+        """Validates that finish_reason is one of the allowed values."""
+        allowed_reasons = {
+            "stop",
+            "length",
+            "tool_calls",
+            "content_filter",
+            "function_call",
+        }
+        if self.finish_reason not in allowed_reasons:
+            raise ValueError(
+                f"Invalid finish_reason: '{self.finish_reason}'. "
+                f"Must be one of {allowed_reasons}"
+            )
+
 
 @dataclass
 class ChatCompletion(ModelResponse):
@@ -73,7 +84,7 @@ class ChatCompletion(ModelResponse):
     model: str
     """The model used for the chat completion."""
 
-    object: Literal["chat.completion"]
+    object: str
     """The object type, which is always `chat.completion`."""
 
     system_fingerprint: Optional[str] = None
@@ -85,3 +96,10 @@ class ChatCompletion(ModelResponse):
 
     usage: Optional[CompletionUsage] = None
     """Usage statistics for the completion request."""
+
+    def __post_init__(self):
+        """Validates that the object type is correct."""
+        if self.object != "chat.completion":
+            raise ValueError(
+                f"Invalid object type: '{self.object}'. Must be 'chat.completion'"
+            )

qwak/llmops/generation/chat/openai/types/chat/chat_completion_chunk.py

@@ -16,8 +16,6 @@
 from dataclasses import dataclass
 from typing import List, Optional
 
-from typing_extensions import Literal
-
 from qwak.llmops.generation.base import ModelResponse
 from .chat_completion_token_logprob import ChatCompletionTokenLogprob
 
@@ -69,9 +67,16 @@ class ChoiceDeltaToolCall:
 
     function: Optional[ChoiceDeltaToolCallFunction] = None
 
-    type: Optional[Literal["function"]] = None
+    type: Optional[str] = None
     """The type of the tool. Currently, only `function` is supported."""
 
+    def __post_init__(self):
+        """Validates that type is 'function' if present."""
+        if self.type is not None and self.type != "function":
+            raise ValueError(
+                f"Invalid type: '{self.type}'. Must be 'function' or None."
+            )
+
 
 @dataclass
 class ChoiceDelta:
@@ -85,11 +90,21 @@ class ChoiceDelta:
     model.
     """
 
-    role: Optional[Literal["system", "user", "assistant", "tool"]] = None
+    role: Optional[str] = None
     """The role of the author of this message."""
 
     tool_calls: Optional[List[ChoiceDeltaToolCall]] = None
 
+    def __post_init__(self):
+        """Validates that role is one of the allowed values if present."""
+        if self.role is not None:
+            allowed_roles = {"system", "user", "assistant", "tool"}
+            if self.role not in allowed_roles:
+                raise ValueError(
+                    f"Invalid role: '{self.role}'. "
+                    f"Must be one of {allowed_roles} or None."
+                )
+
 
 @dataclass
 class ChoiceLogprobs:
@@ -105,9 +120,7 @@ class Choice:
     index: int
     """The index of the choice in the list of choices."""
 
-    finish_reason: Optional[
-        Literal["stop", "length", "tool_calls", "content_filter", "function_call"]
-    ] = None
+    finish_reason: Optional[str] = None
     """The reason the model stopped generating tokens.
 
     This will be `stop` if the model hit a natural stop point or a provided stop
@@ -120,6 +133,22 @@ class Choice:
     logprobs: Optional[ChoiceLogprobs] = None
     """Log probability information for the choice."""
 
+    def __post_init__(self):
+        """Validates that finish_reason is one of the allowed values if present."""
+        if self.finish_reason is not None:
+            allowed_reasons = {
+                "stop",
+                "length",
+                "tool_calls",
+                "content_filter",
+                "function_call",
+            }
+            if self.finish_reason not in allowed_reasons:
+                raise ValueError(
+                    f"Invalid finish_reason: '{self.finish_reason}'. "
+                    f"Must be one of {allowed_reasons} or None."
+                )
+
 
 @dataclass
 class ChatCompletionChunk(ModelResponse):
@@ -141,7 +170,7 @@ class ChatCompletionChunk(ModelResponse):
     model: str
     """The model to generate the completion."""
 
-    object: Literal["chat.completion.chunk"]
+    object: str
     """The object type, which is always `chat.completion.chunk`."""
 
     system_fingerprint: Optional[str] = None
@@ -150,3 +179,10 @@ class ChatCompletionChunk(ModelResponse):
     Can be used in conjunction with the `seed` request parameter to understand when
     backend changes have been made that might impact determinism.
     """
+
+    def __post_init__(self):
+        """Validates that the object type is correct."""
+        if self.object != "chat.completion.chunk":
+            raise ValueError(
+                f"Invalid object type: '{self.object}'. Must be 'chat.completion.chunk'"
+            )

qwak/llmops/generation/chat/openai/types/chat/chat_completion_message.py

@@ -16,8 +16,6 @@
 from dataclasses import dataclass
 from typing import List, Optional
 
-from typing_extensions import Literal
-
 from .chat_completion_message_tool_call import ChatCompletionMessageToolCall
 
 __all__ = ["ChatCompletionMessage", "FunctionCall"]
@@ -39,7 +37,7 @@ class FunctionCall:
 
 @dataclass
 class ChatCompletionMessage:
-    role: Literal["assistant"]
+    role: str
     """The role of the author of this message."""
 
     content: Optional[str] = None
@@ -54,3 +52,8 @@ class ChatCompletionMessage:
 
     tool_calls: Optional[List[ChatCompletionMessageToolCall]] = None
     """The tool calls generated by the model, such as function calls."""
+
+    def __post_init__(self):
+        """Validates that the role type is correct."""
+        if self.role != "assistant":
+            raise ValueError(f"Invalid object type: '{self.role}'. Must be 'assistant'")

qwak/qwak_client/client.py

@@ -238,8 +238,8 @@ class QwakClient:
         model = self._get_model_management().get_model(model_id=model_id)
         model_uuid = model.uuid
 
-        metric_filters = list()
-        parameter_filters = list()
+        metric_filters = []
+        parameter_filters = []
 
         for build_filter in filters:
             if isinstance(build_filter, MetricFilter):
@@ -356,7 +356,6 @@ class QwakClient:
         self,
         project_name: str,
         project_description: str,
-        jfrog_project_key: Optional[str] = None,
     ) -> str:
         """
         Create project
@@ -364,7 +363,6 @@ class QwakClient:
         Args:
             project_name (str): The requested name
             project_description (str): The requested description
-            jfrog_project_key (Optional[str]): The requested jfrog project key
 
         Returns:
              str: The project ID of the newly created project
@@ -373,7 +371,6 @@ class QwakClient:
         project = self._get_project_management().create_project(
             project_name=project_name,
             project_description=project_description,
-            jfrog_project_key=jfrog_project_key,
         )
 
         return project.project.project_id
@@ -419,7 +416,6 @@ class QwakClient:
         project_id: str,
         model_name: str,
         model_description: str,
-        jfrog_project_key: Optional[str] = None,
     ) -> str:
         """
         Create model
@@ -428,7 +424,6 @@ class QwakClient:
             project_id (str): The project ID to associate the model
             model_name (str): The requested name
             model_description (str): The requested description
-            jfrog_project_key (Optional[str]): The jfrog project key
 
         Returns:
              str: The model ID of the newly created project
@@ -438,7 +433,6 @@ class QwakClient:
             project_id=project_id,
             model_name=model_name,
             model_description=model_description,
-            jfrog_project_key=jfrog_project_key,
         )
 
         return model.model_id

qwak/vector_store/rest_helpers.py

@@ -4,25 +4,16 @@ import socket
 from datetime import datetime
 
 import requests
-from qwak.inner.di_configuration.account import UserAccountConfiguration
-from qwak.inner.tool.auth import Auth0ClientBase, FrogMLAuthClient
-from qwak.inner.const import QwakConstants
+from qwak.inner.tool.auth import Auth0ClientBase
 
 
 def _get_authorization():
-    user_account_configuration = UserAccountConfiguration()
-    if issubclass(user_account_configuration._auth_client, Auth0ClientBase):
-        auth_client = Auth0ClientBase()
-        tenant_id = None
-    else:
-        auth_client = FrogMLAuthClient()
-        tenant_id = auth_client.get_tenant_id()
-
+    auth_client = Auth0ClientBase()
     token = auth_client.get_token()
     token_split = token.split(".")
     decoded_token = json.loads(_base64url_decode(token_split[1]).decode("utf-8"))
     token_expiration = datetime.fromtimestamp(decoded_token["exp"])
-    return f"Bearer {token}", token_expiration, tenant_id
+    return f"Bearer {token}", token_expiration
 
 
 def _base64url_decode(input):
@@ -77,8 +68,5 @@ class RestSession(requests.Session):
         return super().prepare_request(request)
 
     def prepare_request_token(self):
-        auth_token, self.jwt_expiration, tenant_id = _get_authorization()
+        auth_token, self.jwt_expiration = _get_authorization()
         self.headers["Authorization"] = auth_token
-
-        if tenant_id:
-            self.headers[QwakConstants.JFROG_TENANT_HEADER_KEY] = tenant_id

qwak_core-0.5.4.dist-info/METADATA

@@ -0,0 +1,48 @@
+Metadata-Version: 2.3
+Name: qwak-core
+Version: 0.5.4
+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
+Author: Qwak
+Author-email: info@qwak.com
+Requires-Python: >=3.9,<3.12
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: OS Independent
+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 :: Implementation :: CPython
+Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
+Provides-Extra: feature-store
+Requires-Dist: PyYAML (>=6.0.2)
+Requires-Dist: cachetools
+Requires-Dist: chevron (==0.14.0)
+Requires-Dist: cloudpickle (==2.2.1) ; extra == "feature-store"
+Requires-Dist: dacite (==1.9.2)
+Requires-Dist: dependency-injector (>=4.0)
+Requires-Dist: filelock
+Requires-Dist: grpcio (>=1.71.2)
+Requires-Dist: joblib (>=1.3.2,<2.0.0)
+Requires-Dist: marshmallow-dataclass (>=8.5.8,<9.0.0)
+Requires-Dist: protobuf (>=4.25.8,<5)
+Requires-Dist: pyarrow (>=20.0.0) ; extra == "feature-store"
+Requires-Dist: pyathena (>=2.2.0,!=2.18.0) ; extra == "feature-store"
+Requires-Dist: pydantic
+Requires-Dist: pyspark (==3.5.7) ; extra == "feature-store"
+Requires-Dist: python-jose[cryptography] (>=3.4.0)
+Requires-Dist: python-json-logger (>=2.0.2)
+Requires-Dist: requests
+Requires-Dist: retrying (==1.4.2)
+Requires-Dist: tqdm
+Requires-Dist: typeguard (>=2,<3)
+Requires-Dist: typer
+Project-URL: Home page, https://www.qwak.com/
+Description-Content-Type: text/markdown
+
+# Qwak Core
+
+Qwak is an end-to-end production ML platform designed to allow data scientists to build, deploy, and monitor their models in production with minimal engineering friction.
+Qwak Core contains all the objects and tools necessary to use the Qwak Platform
+