qwak-core 0.4.272__py3-none-any.whl → 0.4.273__py3-none-any.whl

frogml_storage/utils/_url_utils.py

@@ -0,0 +1,27 @@
+from typing import Optional, List
+from urllib.parse import urlparse
+
+
+def join_url(base_uri: str, *parts: str) -> str:
+    base_uri = base_uri.rstrip("/")
+
+    cleaned_parts: List[str] = [
+        part.strip("/") for part in parts if part is not None and part.strip("/")
+    ]
+    uri_parts: List[str] = [base_uri, *cleaned_parts]
+
+    return "/".join(uri_parts)
+
+
+def assemble_artifact_url(uri: Optional[str]) -> str:
+    if uri is None:
+        raise Exception("Artifactory URI is required")
+
+    parsed_url = urlparse(uri)
+    if parsed_url.scheme not in ["http", "https"]:
+        raise Exception(
+            f"Not a valid Artifactory URI: {uri}. "
+            f"Artifactory URI example: `https://frogger.jfrog.io/artifactory/ml-local`"
+        )
+
+    return f"{parsed_url.scheme}://{parsed_url.netloc}/artifactory"

qwak/__init__.py

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

qwak/clients/instance_template/client.py

@@ -49,10 +49,12 @@ class InstanceTemplateManagementClient:
 
     def list_instance_templates(self) -> List[InstanceTemplateSpec]:
         try:
-            result: ListInstanceTemplatesResponse = self._instance_template_service.ListInstanceTemplates(
-                ListInstanceTemplatesRequest(
-                    optional_instance_filter=InstanceFilter(
-                        instance_type_filter=InstanceTypeFilter.INSTANCE_TYPE_FILTER_ALL
+            result: ListInstanceTemplatesResponse = (
+                self._instance_template_service.ListInstanceTemplates(
+                    ListInstanceTemplatesRequest(
+                        optional_instance_filter=InstanceFilter(
+                            instance_type_filter=InstanceTypeFilter.INSTANCE_TYPE_FILTER_ALL
+                        )
                     )
                 )
             )

qwak/clients/prompt_manager/model_descriptor_mapper.py

@@ -44,10 +44,10 @@ class ModelDescriptorMapper:
         model_id: str, openai_chat_params: ProtoOpenAIChatModelParams
     ) -> OpenAIChat:
         p = openai_chat_params
-        _tool_choice: Union[
-            str, ChatCompletionNamedToolChoiceParam
-        ] = ModelDescriptorMapper._from_tool_choice(
-            openai_chat_params=openai_chat_params
+        _tool_choice: Union[str, ChatCompletionNamedToolChoiceParam] = (
+            ModelDescriptorMapper._from_tool_choice(
+                openai_chat_params=openai_chat_params
+            )
         )
         _tools: List[ChatCompletionToolParam] = []
 
@@ -57,21 +57,23 @@ class ModelDescriptorMapper:
 
         return OpenAIChat(
             model_id=model_id,
-            frequency_penalty=p.frequency_penalty
-            if p.HasField("frequency_penalty")
-            else None,
-            logit_bias={k: int(v) for k, v in p.logit_bias.items()}
-            if p.HasField("logit_bias")
-            else None,
+            frequency_penalty=(
+                p.frequency_penalty if p.HasField("frequency_penalty") else None
+            ),
+            logit_bias=(
+                {k: int(v) for k, v in p.logit_bias.items()}
+                if p.HasField("logit_bias")
+                else None
+            ),
             logprobs=p.logprobs if p.HasField("logprobs") else None,
             max_tokens=p.max_tokens if p.HasField("max_tokens") else None,
             n=p.n if p.HasField("n") else None,
-            presence_penalty=p.presence_penalty
-            if p.HasField("presence_penalty")
-            else None,
-            response_format=p.response_format
-            if p.HasField("response_format")
-            else None,  # noqa
+            presence_penalty=(
+                p.presence_penalty if p.HasField("presence_penalty") else None
+            ),
+            response_format=(
+                p.response_format if p.HasField("response_format") else None
+            ),  # noqa
             seed=p.seed if p.HasField("seed") else None,
             stop=[_ for _ in p.stop] if p.HasField("stop") else None,
             temperature=p.temperature if p.HasField("temperature") else None,
@@ -150,9 +152,9 @@ class ModelDescriptorMapper:
                     max_tokens=d.max_tokens,
                     n=d.n,
                     presence_penalty=d.presence_penalty,
-                    response_format=d.response_format
-                    if d.response_format
-                    else None,  # noqa
+                    response_format=(
+                        d.response_format if d.response_format else None
+                    ),  # noqa
                     seed=d.seed,
                     stop=stop_list_value if d.stop else None,
                     temperature=d.temperature,

qwak/feature_store/_common/artifact_utils.py

@@ -45,9 +45,9 @@ class ArtifactsUploader:
         featureset_name: str,
         __instance_module_path__: str,
     ) -> Optional[ArtifactSpec]:
-        transformation_functions: Optional[
-            List[Callable[..., Any]]
-        ] = transformation.get_functions()
+        transformation_functions: Optional[List[Callable[..., Any]]] = (
+            transformation.get_functions()
+        )
         if transformation_functions is not None and transformation_functions:
             return ArtifactSpec(
                 artifact_name=featureset_name,

qwak/feature_store/data_sources/base.py

@@ -63,10 +63,10 @@ class BaseSource(ABC):
             uploaded_artifact_url = self._upload_artifact()
 
         if source_definition_path:
-            presign_url: str = (
-                FeatureRegistryClient().get_datasource_source_code_presign_url(
-                    ds_name=self.name
-                )
+            presign_url: (
+                str
+            ) = FeatureRegistryClient().get_datasource_source_code_presign_url(
+                ds_name=self.name
             )
             source_code_spec: SourceCodeSpec = (
                 SourceCodeSpecFactory.get_zip_source_code_spec(

qwak/feature_store/data_sources/batch/athena.py

@@ -118,9 +118,9 @@ class AthenaSource(JdbcSource):
             )
         )
 
-        time_partition_columns: Optional[
-            TimePartitionColumns
-        ] = AthenaSource._extract_partition_column(proto_athena_source)
+        time_partition_columns: Optional[TimePartitionColumns] = (
+            AthenaSource._extract_partition_column(proto_athena_source)
+        )
         workgroup: Optional[str] = (
             proto_athena_source.workgroup
             if proto_athena_source.HasField("workgroup")

qwak/feature_store/feature_sets/streaming.py

@@ -120,9 +120,9 @@ def feature_set(
             offline_scheduling_policy=offline_scheduling_policy,
         )
 
-        streaming_backfill: Optional[
-            StreamingBackfill
-        ] = StreamingBackfill.get_streaming_backfill_from_function(function=function)
+        streaming_backfill: Optional[StreamingBackfill] = (
+            StreamingBackfill.get_streaming_backfill_from_function(function=function)
+        )
 
         fs_name = name or function.__name__
         streaming_feature_set = StreamingFeatureSet(

qwak/feature_store/feature_sets/streaming_backfill.py

@@ -218,7 +218,7 @@ class StreamingBackfill:
 
     @staticmethod
     def _get_normalized_backfill_sources_spec(
-        data_sources: Union[List[str], List[DataSourceBackfillSpec]]
+        data_sources: Union[List[str], List[DataSourceBackfillSpec]],
     ) -> List[DataSourceBackfillSpec]:
         # reformat all data source specs to 'DataSourceBackfillSpec'
         return [

qwak/feature_store/online/client.py

@@ -182,12 +182,12 @@ class OnlineClient:
         )
         ordered_entities = [entity[0] for entity in ordered_entities_tuple]
 
-        request_chunks: List[
-            Tuple[RequestedEntitiesMatrix, pd.DataFrame]
-        ] = OnlineClient._split_entities(
-            entity_names=ordered_entities,
-            population_df=df,
-            max_entities_per_split=max_keys_per_request,
+        request_chunks: List[Tuple[RequestedEntitiesMatrix, pd.DataFrame]] = (
+            OnlineClient._split_entities(
+                entity_names=ordered_entities,
+                population_df=df,
+                max_entities_per_split=max_keys_per_request,
+            )
         )
 
         results: List[pd.DataFrame] = []

qwak/feature_store/sinks/streaming/factory.py

@@ -25,7 +25,7 @@ class StreamingSinkFactory:
     def get_streaming_sink(proto_streaming_sink: ProtoStreamingSink) -> BaseSink:
         sink_type = proto_streaming_sink.WhichOneof("sink_type")
 
-        auth_conf: BaseAuthentication
+        auth_conf: BaseAuthentication  # noqa: F842
         if sink_type == "kafka_sink":
             proto_kafka_sink: ProtoKafkaSink = proto_streaming_sink.kafka_sink
             auth_configuration: BaseAuthentication = cast(

qwak/inner/build_logic/phases/phase_010_fetch_model/fetch_strategy_manager/strategy/git/git_strategy.py

@@ -163,9 +163,9 @@ def make_ssh_key_file(git_ssh_key: str) -> str:
 
 
 def add_ssh_file_to_env(ssh_key_file_path: str) -> None:
-    os.environ[
-        "GIT_SSH_COMMAND"
-    ] = f"ssh -i {ssh_key_file_path} -o StrictHostKeyChecking=no"
+    os.environ["GIT_SSH_COMMAND"] = (
+        f"ssh -i {ssh_key_file_path} -o StrictHostKeyChecking=no"
+    )
     os.environ["GIT_SSH"] = f"ssh -i {ssh_key_file_path} -o StrictHostKeyChecking=no"
 
 

qwak/inner/di_configuration/account.py

@@ -8,7 +8,7 @@ from qwak.exceptions import QwakLoginException
 from qwak.inner.const import QwakConstants
 from qwak.inner.di_configuration.session import Session
 from qwak.inner.tool.auth import Auth0ClientBase, FrogMLAuthClient
-from frogml_storage.cli._login_cli import login as frogml_login
+from frogml_storage.authentication.login import frogml_login
 
 
 @dataclass
@@ -58,7 +58,7 @@ class UserAccountConfiguration:
         if not self._auth_client:
             # Determine auth client based on FrogML configuration
             try:
-                from frogml_storage.authentication._authentication_utils import (
+                from frogml_storage.authentication.utils import (
                     get_frogml_configuration,
                 )
 
@@ -77,28 +77,7 @@ class UserAccountConfiguration:
         """
         if issubclass(self._auth_client, Auth0ClientBase):
             # Existing Qwak authentication flow
-            self._auth.read(self._auth_file)
-            self._auth.remove_section(self._environment)
-            with self._safe_open(self._auth_file) as authfile:
-                self._auth.write(authfile)
-
-            self._auth_client(
-                api_key=user_account.api_key,
-                auth_file=self._auth_file,
-            ).login()
-
-            # Store configuration only for Qwak auth
-            self._config.read(self._config_file)
-            with self._safe_open(self._config_file) as configfile:
-                self._config[self._environment] = {}
-                if user_account.username:
-                    self._config[self._environment][
-                        self.USER_FIELD
-                    ] = user_account.username
-                self._config[self._environment][
-                    self.API_KEY_FIELD
-                ] = user_account.api_key
-                self._config.write(configfile)
+            self.__qwak_login(user_account)
 
         elif issubclass(self._auth_client, FrogMLAuthClient):
             # Use FrogML's login flow
@@ -121,6 +100,26 @@ class UserAccountConfiguration:
                     "Authentication with JFrog failed: Only Access Tokens are supported. Please ensure you are using a valid Access Token."
                 )
 
+    def __qwak_login(self, user_account: UserAccount):
+        self._auth.read(self._auth_file)
+        self._auth.remove_section(self._environment)
+        with self._safe_open(self._auth_file) as authfile:
+            self._auth.write(authfile)
+
+        self._auth_client(
+            api_key=user_account.api_key,
+            auth_file=self._auth_file,
+        ).login()
+
+        # Store configuration only for Qwak auth
+        self._config.read(self._config_file)
+        with self._safe_open(self._config_file) as configfile:
+            self._config[self._environment] = {}
+            if user_account.username:
+                self._config[self._environment][self.USER_FIELD] = user_account.username
+            self._config[self._environment][self.API_KEY_FIELD] = user_account.api_key
+            self._config.write(configfile)
+
     @staticmethod
     def _mkdir_p(path):
         try:

qwak/inner/tool/auth.py

@@ -5,8 +5,8 @@ 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._authentication_utils import get_credentials
-from frogml_storage.authentication.models._auth_config import AuthConfig
+from frogml_storage.authentication.utils import get_credentials
+from frogml_storage.authentication.models import AuthConfig
 
 warnings.filterwarnings(action="ignore", module=".*jose.*")
 

qwak/llmops/provider/openai/provider.py

@@ -26,9 +26,9 @@ class OpenAIProvider:
         self.client = OpenAIClient()
 
     def _get_random_openai_api_key(self) -> Optional[str]:
-        openai_api_keys: List[
-            OpenAIApiKeySystemSecret
-        ] = IntegrationUtils().get_openai_api_keys()
+        openai_api_keys: List[OpenAIApiKeySystemSecret] = (
+            IntegrationUtils().get_openai_api_keys()
+        )
         if len(openai_api_keys) == 0:
             return None
 

qwak/model/tools/adapters/output.py

@@ -46,7 +46,7 @@ def get_output_adapter(
 
             first_result = (
                 return_result[0]
-                if type(return_result) == list and len(return_result) > 0
+                if isinstance(return_result, list) and len(return_result) > 0
                 else return_result
             )
             if issubclass(type(first_result), Message):

qwak/model/utils/feature_utils.py

@@ -30,15 +30,19 @@ def validate_and_sanitize_features_name(
     ecosystem_utils = EcosystemUtils()
     current_env_name = ecosystem_utils.get_current_environment_name()
     return [
-        cast(
-            FeatureStoreInput,
-            dataclasses.replace(
-                feature,
-                name=validate_and_sanitize_feature_name(feature.name, current_env_name),
-            ),
+        (
+            cast(
+                FeatureStoreInput,
+                dataclasses.replace(
+                    feature,
+                    name=validate_and_sanitize_feature_name(
+                        feature.name, current_env_name
+                    ),
+                ),
+            )
+            if isinstance(feature, FeatureStoreInput)
+            else feature
         )
-        if isinstance(feature, FeatureStoreInput)
-        else feature
         for feature in features
     ]
 

qwak/model_loggers/artifact_logger.py

@@ -92,13 +92,13 @@ def load_file(
         )
 
     model_id = validate_model(model_id)
-    download_url_response: GetBuildVersioningDownloadURLResponse = (
-        BuildOrchestratorClient().get_build_versioning_download_url(
-            build_id=build_id,
-            model_id=model_id,
-            tag=tag,
-            tag_type=BuildVersioningTagsType.FILE_TAG_TYPE,
-        )
+    download_url_response: (
+        GetBuildVersioningDownloadURLResponse
+    ) = BuildOrchestratorClient().get_build_versioning_download_url(
+        build_id=build_id,
+        model_id=model_id,
+        tag=tag,
+        tag_type=BuildVersioningTagsType.FILE_TAG_TYPE,
     )
 
     try:

qwak/tools/logger/logger.py

@@ -275,7 +275,7 @@ def set_file_handler_log_file(
     logger: logging.Logger, handler_name: str, log_file: Path
 ):
     existing_handler = get_handler_from_logger(logger, handler_name)
-    if type(existing_handler) != RotatingFileHandler:
+    if not isinstance(existing_handler, RotatingFileHandler):
         raise QwakException(
             f"Error in setting log file. Error message: handler of name {handler_name} is not a file logger handler"
         )