frogml-core 0.0.114__tar.gz → 0.0.116__tar.gz

{frogml_core-0.0.114 → frogml_core-0.0.116}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-core
-Version: 0.0.114
+Version: 0.0.116
 Summary: frogml Core contains the necessary objects and communication tools for using the Jfrog ml Platform
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/__init__.py

@@ -1,7 +1,7 @@
 """Top-level package for frogml."""
 
 __author__ = "jfrog"
-__version__ = "0.0.114"
+__version__ = "0.0.116"
 
 from frogml_core.inner.di_configuration import wire_dependencies
 from frogml_core.model.model_version_tracking import (  # noqa: F401,E501

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/clients/administration/authentication/client.py

@@ -5,7 +5,7 @@ from frogml_proto.qwak.administration.v0.authentication.authentication_service_p
     AuthenticateRequest,
 )
 from frogml_proto.qwak.administration.v0.authentication.authentication_service_pb2 import (
-    QwakApiKeyMethod as JFrogMLApiKeyMethod,
+    QwakApiKeyMethod,
 )
 from frogml_proto.qwak.administration.v0.authentication.authentication_service_pb2_grpc import (
     AuthenticationServiceStub,
@@ -26,7 +26,7 @@ class AuthenticationClient:
 
     def authenticate(self, api_key=None):
         request = AuthenticateRequest(
-            qwak_api_key_method=JFrogMLApiKeyMethod(qwak_api_key=api_key)
+            qwak_api_key_method=QwakApiKeyMethod(qwak_api_key=api_key)
         )
         try:
             return self._authentication_service.Authenticate(request)

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/clients/batch_job_management/client.py

@@ -407,7 +407,7 @@ class BatchJobManagerClient:
         self, model_id: str, number_of_batches: int, file_type: str = "csv"
     ) -> GetBatchJobPreSignedUploadUrlResult:
         """
-        Get pre signed upload urls details in order to start a job using Qwak cloud bucket
+        Get pre signed upload urls details in order to start a job using FrogML cloud bucket
         Args:
             model_id: The model id for the execution
             number_of_batches: The number of pre-signed urls to request
@@ -445,7 +445,7 @@ class BatchJobManagerClient:
         self, execution_id: str
     ) -> GetBatchJobPreSignedDownloadUrlResult:
         """
-        Get pre signed urls links in order to download files using Qwak cloud bucket
+        Get pre signed urls links in order to download files using FrogML cloud bucket
         Args:
             execution_id: The execution id of the files
 
@@ -475,7 +475,7 @@ class BatchJobManagerClient:
 
     def get_upload_details(self, model_id: str) -> GetBatchJobUploadDetailsResponse:
         """
-        Get upload details in order to start a job using Qwak cloud bucket
+        Get upload details in order to start a job using FrogML cloud bucket
         Args:
         model_id: The model id for the execution
 
@@ -496,7 +496,7 @@ class BatchJobManagerClient:
         self, execution_id: str
     ) -> GetBatchJobDownloadDetailsResponse:
         """
-        Get download details in order to download files using Qwak cloud bucket
+        Get download details in order to download files using FrogML cloud bucket
         Args:
         execution_id: The execution id of the files
 

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/clients/build_orchestrator/build_model_request_getter.py

@@ -32,10 +32,10 @@ def _get_build_model_spec(
     build_code_path: str = "",
     build_v1_flag: bool = False,
     build_config_url: str = "",
-    qwak_sdk_wheel_url: str = "",
-    qwak_sdk_version_url: str = "",
+    frogml_cli_wheel_url: str = "",
+    frogml_cli_version_url: str = "",
     build_steps: Optional[List[str]] = None,
-    sdk_version: str = "",
+    cli_version: str = "",
 ) -> RemoteBuildSpec:
     build_spec = RemoteBuildSpec(
         build_properties=BuildProperties(
@@ -65,7 +65,7 @@ def _get_build_model_spec(
             python_env=PythonEnv(
                 git_credentials=build_conf.build_properties.model_uri.git_credentials,
                 git_credentials_secret=build_conf.build_properties.model_uri.git_credentials_secret,
-                qwak_sdk_version=sdk_version,
+                qwak_sdk_version=cli_version,
             ),
         ),
         verbose=verbose,
@@ -75,8 +75,8 @@ def _get_build_model_spec(
         ),
         build_properties_v1=BuildPropertiesV1(
             build_config_url=build_config_url,
-            qwak_sdk_wheel_url=qwak_sdk_wheel_url,
-            qwak_sdk_version_url=qwak_sdk_version_url,
+            qwak_sdk_wheel_url=frogml_cli_wheel_url,
+            qwak_sdk_version_url=frogml_cli_version_url,
         ),
         build_v1_flag=build_v1_flag,
         build_steps=build_steps,

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/clients/build_orchestrator/client.py

@@ -365,10 +365,10 @@ class BuildOrchestratorClient:
         build_code_path: str = "",
         build_v1_flag: bool = False,
         build_config_url: str = "",
-        qwak_sdk_wheel_url: str = "",
-        qwak_sdk_version_url: str = "",
+        frogml_cli_wheel_url: str = "",
+        frogml_cli_version_url: str = "",
         build_steps: Optional[List[str]] = None,
-        sdk_version: str = "",
+        cli_version: str = "",
     ):
         """Initiate remote build
 
@@ -380,13 +380,13 @@ class BuildOrchestratorClient:
             build_code_path: The code  path saved by frogml
             build_v1_flag:
             build_config_url:
-            qwak_sdk_wheel_url:
-            qwak_sdk_version_url:
+            frogml_cli_wheel_url: Url for wheel file
+            frogml_cli_version_url: The cli version
             build_steps: List of the steps the build is comprised from
-            sdk_version: The sdk version to build the
+            cli_version: The cli version to build the
 
         Raises:
-            QwakException: In case of failing to connect the service
+            FrogmlException: In case of failing to connect the service
         """
         build_steps = build_steps if build_steps else []
 
@@ -399,10 +399,10 @@ class BuildOrchestratorClient:
                 build_code_path,
                 build_v1_flag,
                 build_config_url,
-                qwak_sdk_wheel_url,
-                qwak_sdk_version_url,
+                frogml_cli_wheel_url,
+                frogml_cli_version_url,
                 build_steps,
-                sdk_version,
+                cli_version,
             )
             self._builds_orchestrator_stub.BuildModel(
                 BuildModelRequest(build_spec=build_spec)
@@ -424,7 +424,7 @@ class BuildOrchestratorClient:
             build_id: The build ID to cancel
 
         Raises:
-            QwakException: In case of failing to connect the service
+            FrogmlException: In case of failing to connect the service
         """
         try:
             self._builds_orchestrator_stub.CancelBuildModel(
@@ -444,7 +444,7 @@ class BuildOrchestratorClient:
         Returns:
             The base docker image name
         Raises:
-            QwakException: In case of failing to connect the service
+            FrogmlException: In case of failing to connect the service
         """
         try:
             return self._builds_orchestrator_stub.GetBaseDockerImageName(

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/clients/build_orchestrator/internal_client.py

@@ -43,11 +43,11 @@ class InternalBuildOrchestratorClient:
         build_code_path: str = "",
         build_v1_flag: bool = False,
         build_config_url: str = "",
-        qwak_sdk_wheel_url: str = "",
-        qwak_sdk_version_url: str = "",
+        frogml_cli_wheel_url: str = "",
+        frogml_cli_version_url: str = "",
         build_steps: Optional[List[str]] = None,
         build_initiator: BuildInitiator = None,
-        sdk_version: str = "",
+        cli_version: str = "",
     ):
         """Initiate remote build
 
@@ -59,14 +59,14 @@ class InternalBuildOrchestratorClient:
             build_code_path: The code  path saved by frogml
             build_v1_flag:
             build_config_url:
-            qwak_sdk_wheel_url:
-            qwak_sdk_version_url:
+            frogml_cli_wheel_url: Url for wheel file
+            frogml_cli_version_url: The cli version
             build_steps: List of the steps the build is comprised from
             build_initiator: Override the initiator of build
-            sdk_version: The sdk version to build the
+            cli_version: The cli version to build the
 
         Raises:
-            QwakException: In case of failing to connect the service
+            FrogmlException: In case of failing to connect the service
         """
         if not self._internal_builds_orchestrator_stub:
             grpc_channel = self.grpc_channel_factory(
@@ -91,10 +91,10 @@ class InternalBuildOrchestratorClient:
                 build_code_path,
                 build_v1_flag,
                 build_config_url,
-                qwak_sdk_wheel_url,
-                qwak_sdk_version_url,
+                frogml_cli_wheel_url,
+                frogml_cli_version_url,
                 build_steps,
-                sdk_version,
+                cli_version,
             )
             self._internal_builds_orchestrator_stub.BuildModel(
                 InternalBuildModelRequest(

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/frogml_client/build_api_helpers/build_api_steps.py

@@ -24,8 +24,8 @@ from frogml_core.inner.build_logic.phases.phase_020_remote_register_frogml_build
 from frogml_core.inner.build_logic.phases.phases_pipeline import PhasesPipeline
 from frogml_core.inner.build_logic.trigger_build_context import TriggerBuildContext
 
-FETCHING_MODEL_CODE_PHASE = "FETCHING_MODEL_CODE"
-REGISTERING_QWAK_BUILD_PHASE = "REGISTERING_QWAK_BUILD"
+FETCHING_MODEL_CODE_PHASE: str = "FETCHING_MODEL_CODE"
+REGISTERING_FROGML_BUILD_PHASE: str = "REGISTERING_FROGML_BUILD"
 
 
 def get_trigger_build_api_steps(
@@ -47,7 +47,7 @@ def get_trigger_build_api_steps(
             StartRemoteBuildStep(),
             CleanupStep(),
         ],
-        build_phase=BuildPhase(phase_id=REGISTERING_QWAK_BUILD_PHASE),
+        build_phase=BuildPhase(phase_id=REGISTERING_FROGML_BUILD_PHASE),
     )
 
     return steps_root

frogml_core-0.0.116/frogml_core/inner/build_logic/constants/upload_tag.py

@@ -0,0 +1,7 @@
+MODEL_CODE_TAG: str = "code.zip"
+SKINNY_MODEL_CODE_TAG: str = "skinny_code.zip"
+FROGML_CLI_VERSION_TAG: str = "frogml_cli_version"
+FROGML_RUNTIME_WHEEL_TAG: str = "frogml_runtime_wheel"
+FROGML_CORE_WHEEL_TAG: str = "frogml_core_wheel"
+BUILD_CONFIG_TAG: str = "frogml_build_config"
+FROGML_BUILT_MODEL_TAG: str = "frogml_built_model"

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/inner/build_logic/interface/context_interface.py

@@ -48,7 +48,7 @@ class Context(metaclass=ABCMeta):
 
     # Upload model
     model_code_remote_url: Optional[str] = field(default=None)
-    frogml_sdk_version: Optional[str] = field(default=None)
+    frogml_cli_version: Optional[str] = field(default=None)
 
     # Image
     base_image: Optional[str] = field(default=None)

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/inner/build_logic/phases/phase_010_fetch_model/fetch_strategy_manager/strategy/strategy.py

@@ -11,16 +11,16 @@ from frogml_core.inner.build_logic.tools.ignore_files import (
 )
 
 _IGNORED_PATTERNS = [r"\..*", r"__pycache__"]
-QWAK_IGNORE_FILE_NAME = ".qwakignore"
+FROGML_IGNORE_FILE_NAME: str = ".frogmlignore"
 
 
 def get_ignore_pattern(
     src: str, main_dir: str, build_logger: BuildLogger
 ) -> Tuple[Callable[[Any, list[str]], set[str]], list[str]]:
-    if (Path(src) / main_dir / QWAK_IGNORE_FILE_NAME).is_file():
-        ignore_file_path = Path(src) / main_dir / QWAK_IGNORE_FILE_NAME
+    if (Path(src) / main_dir / FROGML_IGNORE_FILE_NAME).is_file():
+        ignore_file_path: Path = Path(src) / main_dir / FROGML_IGNORE_FILE_NAME
     else:
-        ignore_file_path = Path(src) / QWAK_IGNORE_FILE_NAME
+        ignore_file_path: Path = Path(src) / FROGML_IGNORE_FILE_NAME
 
     ignored_patterns = (
         load_patterns_from_ignore_file(

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/inner/build_logic/phases/phase_010_fetch_model/set_version_step.py

@@ -17,8 +17,8 @@ class SetVersionStep(Step):
     def execute(self) -> None:
         try:
             self.build_logger.debug("Getting sdk version")
-            frogml_sdk_version = importlib.import_module("frogml_sdk").__version__
-            self.context.frogml_sdk_version = frogml_sdk_version
+            frogml_sdk_version: str = importlib.import_module("frogml_sdk").__version__
+            self.context.frogml_cli_version = frogml_sdk_version
             self.build_logger.debug(
                 self.SDK_VERSION_FOUND_MSG_FORMAT.format(
                     frogml_sdk_version=frogml_sdk_version
@@ -30,4 +30,4 @@ class SetVersionStep(Step):
                     frogml_core_version=frogml_core_version
                 )
             )
-            self.context.frogml_sdk_version = frogml_core_version
+            self.context.frogml_cli_version = frogml_core_version

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/inner/build_logic/phases/phase_020_remote_register_frogml_build/start_remote_build_step.py

@@ -3,7 +3,7 @@ from copy import deepcopy
 from frogml_proto.qwak.builds.build_url_pb2 import BuildVersioningTagsType
 from frogml_core.inner.build_logic.constants.upload_tag import (
     BUILD_CONFIG_TAG,
-    FROGML_SDK_VERSION_TAG,
+    FROGML_CLI_VERSION_TAG,
     MODEL_CODE_TAG,
 )
 from frogml_core.inner.build_logic.interface.step_inteface import Step
@@ -24,10 +24,10 @@ class StartRemoteBuildStep(Step):
             build_conf=config_copy,
             build_v1_flag=False,
             build_config_url=self.get_download_url(BUILD_CONFIG_TAG),
-            qwak_sdk_version_url=self.get_download_url(FROGML_SDK_VERSION_TAG),
+            frogml_cli_version_url=self.get_download_url(FROGML_CLI_VERSION_TAG),
             resolved_model_url=self.get_download_url(MODEL_CODE_TAG),
             git_commit_id=self.context.git_commit_id,
-            sdk_version=self.context.qwak_sdk_version,
+            cli_version=self.context.frogml_cli_version,
         )
         self.build_logger.info("Remote build started successfully")
 

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/inner/build_logic/phases/phase_020_remote_register_frogml_build/upload_step.py

@@ -19,7 +19,7 @@ from frogml_core.inner.build_logic.constants.upload_tag import (
     FROGML_BUILT_MODEL_TAG,
     FROGML_CORE_WHEEL_TAG,
     FROGML_RUNTIME_WHEEL_TAG,
-    FROGML_SDK_VERSION_TAG,
+    FROGML_CLI_VERSION_TAG,
     MODEL_CODE_TAG,
     SKINNY_MODEL_CODE_TAG,
 )
@@ -37,13 +37,13 @@ from frogml_core.inner.build_logic.tools.ignore_files import (
 _MAX_FILE_SIZE_BYTES = 10000000
 
 
-def should_retry(qwak_exception: FrogmlException):
+def should_retry(frogml_exception: FrogmlException) -> bool:
     # when Got 403 from Jfrog it means that the reposity doesn't exist. It may happen when in the first build in the project
-    return str(qwak_exception.message).__contains__("403")
+    return "403" in str(frogml_exception.message)
 
 
 class UploadStep(Step):
-    STEP_DESCRIPTION = "Saving Qwak Model"
+    STEP_DESCRIPTION = "Saving FrogML Model"
 
     def description(self) -> str:
         return self.STEP_DESCRIPTION
@@ -124,13 +124,15 @@ class UploadStep(Step):
         config_file_temp.write_text(self.config.to_yaml())
 
         # Dump frogml-sdk version for upload
-        qwak_sdk_version_temp = self.context.host_temp_local_build_dir / "VERSION"
-        qwak_sdk_version_temp.write_text(self.context.qwak_sdk_version)
+        frogml_cli_version_temp_file_path: Path = (
+            self.context.host_temp_local_build_dir / "VERSION"
+        )
+        frogml_cli_version_temp_file_path.write_text(self.context.frogml_cli_version)
 
         files_tag_iterator = [
             (full_size_zip_file, MODEL_CODE_TAG),
             (skinny_size_zip_file, SKINNY_MODEL_CODE_TAG),
-            (qwak_sdk_version_temp, FROGML_SDK_VERSION_TAG),
+            (frogml_cli_version_temp_file_path, FROGML_CLI_VERSION_TAG),
             (config_file_temp, BUILD_CONFIG_TAG),
         ]
 
@@ -211,13 +213,13 @@ class UploadStep(Step):
             headers = {}
 
         try:
-            self.build_logger.debug(f"Upload file {file} to Qwak storage")
+            self.build_logger.debug(f"Upload file {file} to FrogML storage")
 
             self.send_request(
                 upload_url, file, all_files_size_to_upload, read_so_far, headers
             )
             self.build_logger.debug(
-                f"File {file} uploaded to Qwak storage successfully"
+                f"File {file} uploaded to FrogML storage successfully"
             )
         except Exception as e:
             raise FrogmlGeneralBuildException(

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/inner/build_logic/tools/ignore_files.py

@@ -5,16 +5,16 @@ from frogml_core.inner.build_logic.interface.build_logger_interface import Build
 
 def load_patterns_from_ignore_file(build_logger: BuildLogger, ignore_file_path: Path):
     if Path(ignore_file_path).is_file():
-        build_logger.info("Found a Qwak ignore file - will ignore listed patterns")
+        build_logger.info("Found a FrogML ignore file - will ignore listed patterns")
 
         with open(ignore_file_path, "r") as igonre_file:
             patterns_to_ignore = [
                 pattern.strip() for pattern in igonre_file.readlines()
             ]
             build_logger.debug(
-                f"Patterns from Qwak igonre file detected - {str(patterns_to_ignore)}"
+                f"Patterns from FrogML igonre file detected - {str(patterns_to_ignore)}"
             )
             return patterns_to_ignore
 
-    build_logger.debug("no Qwak ignore file was found, skipping")
+    build_logger.debug("no FrogML ignore file was found, skipping")
     return []

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/model/adapters/__init__.py

@@ -14,7 +14,7 @@ from .output_adapters.default_output_adapter import DefaultOutputAdapter
 from .output_adapters.json_output_adapter import JsonOutputAdapter
 from .output_adapters.numpy_output_adapter import NumpyOutputAdapter
 from .output_adapters.proto_output_adapter import ProtoOutputAdapter
-from .output_adapters.qwak_with_default_fallback import AutodetectOutputAdapter
+from .output_adapters.frogml_with_default_fallback import AutodetectOutputAdapter
 from .output_adapters.tf_tensor_output_adapter import TfTensorOutputAdapter
 
 __all__ = [

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/model/analytics_logging.py

@@ -1,7 +1,7 @@
 from frogml_core.inner.singleton_meta import SingletonMeta
 
 
-class QwakAnalyticsLogger(metaclass=SingletonMeta):
+class FrogMLAnalyticsLogger(metaclass=SingletonMeta):
     """
     Base class for Frogml analytics logger
     """

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/model/tools/adapters/input.py

@@ -27,7 +27,7 @@ def get_input_adapter(
 ) -> Union[JsonInput, DataframeInput, StringInput]:
     adapter = getattr(model.predict, "_input_adapter", "")
 
-    class QwakInput(StringInput):
+    class FrogMLInput(StringInput):
         def extract_user_func_args(self, data: str) -> Any:
             try:
                 return adapter.extract_user_func_arg(data)
@@ -38,15 +38,15 @@ def get_input_adapter(
                     f"please check model logs.",
                 )
 
-    class MultiFormatInput(QwakInput):
+    class MultiFormatInput(FrogMLInput):
         pass
 
     mapping = {
         JsonInputAdapter: JsonInput,
         DataFrameInputAdapter: DataframeInput,
         StringInputAdapter: StringInput,
-        ProtoInputAdapter: QwakInput,
-        NumpyInputAdapter: QwakInput,
+        ProtoInputAdapter: FrogMLInput,
+        NumpyInputAdapter: FrogMLInput,
         MultiInputAdapter: MultiFormatInput,
         TfTensorInputAdapter: TfTensorInput,
         ImageInputAdapter: ImageInput,
@@ -55,8 +55,8 @@ def get_input_adapter(
 
     if adapter:
         adapter.mappings = mapping
-        for qwak_impl, runtime_impl in mapping.items():
-            if isinstance(adapter, qwak_impl):
+        for frogml_impl, runtime_impl in mapping.items():
+            if isinstance(adapter, frogml_impl):
                 if isinstance(adapter, DataFrameInputAdapter) and hasattr(
                     adapter, "input_orient"
                 ):

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/model/tools/adapters/output.py

@@ -23,7 +23,7 @@ def get_output_adapter(
 ):
     adapter = getattr(model.predict, "_output_adapter", "")
 
-    class QwakOutput(JsonOutput):
+    class FrogMLOutput(JsonOutput):
         def __init__(self, **kwargs):
             super().__init__(**kwargs)
 
@@ -37,7 +37,7 @@ def get_output_adapter(
                     status_code=500,
                 )
 
-    class QwakOutputWithDefaultFallbackOutput(QwakOutput):
+    class FrogMLOutputWithDefaultFallbackOutput(FrogMLOutput):
         def __init__(self, **kwargs):
             super().__init__(**kwargs)
 
@@ -50,7 +50,7 @@ def get_output_adapter(
                 else return_result
             )
             if issubclass(type(first_result), Message):
-                response = QwakOutput().pack_user_func_return_value(return_result)
+                response = FrogMLOutput().pack_user_func_return_value(return_result)
                 return response
             else:
                 return DefaultOutput().pack_user_func_return_value(return_result)
@@ -59,13 +59,13 @@ def get_output_adapter(
         JsonOutputAdapter: JsonOutput,
         DataFrameOutputAdapter: DataFrameOutput,
         DefaultOutputAdapter: DefaultOutput,
-        AutodetectOutputAdapter: QwakOutputWithDefaultFallbackOutput,
-        ProtoOutputAdapter: QwakOutput,
-        NumpyOutputAdapter: QwakOutput,
+        AutodetectOutputAdapter: FrogMLOutputWithDefaultFallbackOutput,
+        ProtoOutputAdapter: FrogMLOutput,
+        NumpyOutputAdapter: FrogMLOutput,
         TfTensorOutputAdapter: TfTensorOutput,
     }
-    for qwak_impl, runtime_impl in mapping.items():
-        if isinstance(adapter, qwak_impl):
+    for frogml_impl, runtime_impl in mapping.items():
+        if isinstance(adapter, frogml_impl):
             if isinstance(adapter, DataFrameOutputAdapter) and hasattr(
                 adapter, "output_orient"
             ):

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/model/tools/run_model_locally.py

@@ -61,8 +61,8 @@ def _extract_online_features(model, df):
 
 @contextmanager
 def _set_local_mode():
-    os.environ["QWAK_IS_RUN_LOCAL"] = "true"
+    os.environ["FROGML_IS_RUN_LOCAL"] = "true"
     try:
         yield
     finally:
-        del os.environ["QWAK_IS_RUN_LOCAL"]
+        del os.environ["FROGML_IS_RUN_LOCAL"]

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_core/model/utils/feature_utils.py

@@ -27,7 +27,7 @@ def validate_and_sanitize_features_name(
     Add the current env qualifier if env is missing and transform name to lowercase
     :param features:
     :return: sanitized features with lower case (to support case-insensitive) fully qualified feature names
-    :exception QwakException: if the feature name does not adhere to the convention
+    :exception FrogmlException: if the feature name does not adhere to the convention
     """
     ecosystem_utils = EcosystemUtils()
     current_env_name = ecosystem_utils.get_current_environment_name()

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_services_mock/mocks/analytics_api.py

@@ -12,12 +12,12 @@ SUCCESSFUL_QUERY = "select * from successful"
 FAILED_QUERY = "select * from failed"
 TIMEOUT_QUERY = "select * from timeout"
 CANCELLED_QUERY = "select * from cancelled"
-SUCCESSFUL_QUERY_ID = "successful"
-FAILED_QUERY_ID = "failed"
-TIMEOUT_QUERY_ID = "timeout"
-CANCELLED_QUERY_ID = "cancelled"
-FAILURE_REASON = "failure reason"
-DOWNLOAD_URL = "https://qwak.com/download"
+SUCCESSFUL_QUERY_ID: str = "successful"
+FAILED_QUERY_ID: str = "failed"
+TIMEOUT_QUERY_ID: str = "timeout"
+CANCELLED_QUERY_ID: str = "cancelled"
+FAILURE_REASON: str = "failure reason"
+DOWNLOAD_URL: str = "https://jfrog.com/download"
 
 
 class AnalyticsApiMock(AnalyticsQueryServiceServicer):

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_services_mock/mocks/ecosystem_service_api.py

@@ -7,14 +7,14 @@ from frogml_proto.qwak.ecosystem.v0.ecosystem_runtime_service_pb2 import (
     GetCloudCredentialsResponse,
 )
 from frogml_proto.qwak.ecosystem.v0.ecosystem_runtime_service_pb2_grpc import (
-    QwakEcosystemRuntimeServicer,
+    QwakEcosystemRuntimeServicer as FrogmlEcosystemRuntimeServicer,
 )
 from frogml_services_mock.mocks.utils.exception_handlers import (
     raise_internal_grpc_error,
 )
 
 
-class EcoSystemServiceMock(QwakEcosystemRuntimeServicer):
+class EcoSystemServiceMock(FrogmlEcosystemRuntimeServicer):
     def __init__(self):
         self._aws_temp_credentials = None
         self._authenticated_user_context = None

{frogml_core-0.0.114 → frogml_core-0.0.116}/frogml_services_mock/services_mock.py

@@ -57,7 +57,7 @@ from frogml_proto.qwak.deployment.deployment_service_pb2_grpc import (
 from frogml_proto.qwak.ecosystem.jfrog.v0.jfrog_tenant_info_service_pb2_grpc import \
     add_JFrogTenantInfoServiceServicer_to_server
 from frogml_proto.qwak.ecosystem.v0.ecosystem_runtime_service_pb2_grpc import (
-    add_QwakEcosystemRuntimeServicer_to_server,
+    add_QwakEcosystemRuntimeServicer_to_server as add_FrogmlEcosystemRuntimeServicer_to_server,
 )
 from frogml_proto.qwak.execution.v1.execution_service_pb2_grpc import (
     add_FeatureStoreExecutionServiceServicer_to_server,
@@ -363,7 +363,7 @@ def attach_servicers(free_port, server):
             (
                 "ecosystem_client_mock",
                 EcoSystemServiceMock,
-                add_QwakEcosystemRuntimeServicer_to_server,
+                add_FrogmlEcosystemRuntimeServicer_to_server,
             ),
             (
                 "job_registry_service_mock",
@@ -511,11 +511,11 @@ def frogml_services_mock() -> Generator[FrogmlMocks, None, None]:
     free_port = frogml_container()
 
     server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
-    qwak_mocks = attach_servicers(free_port, server)
+    frogml_mocks: FrogmlMocks = attach_servicers(free_port, server)
 
     server.add_insecure_port(f"[::]:{free_port}")
     server.start()
 
-    yield qwak_mocks
+    yield frogml_mocks
 
     server.stop(0)

frogml_core-0.0.116/frogml_storage/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.116"

{frogml_core-0.0.114 → frogml_core-0.0.116}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "frogml-core"
-version = "0.0.114"
+version = "0.0.116"
 description = "frogml Core contains the necessary objects and communication tools for using the Jfrog ml Platform"
 authors = ["Jfrog"]
 readme = "README.md"

frogml_core-0.0.114/frogml_core/inner/build_logic/constants/upload_tag.py

@@ -1,7 +0,0 @@
-MODEL_CODE_TAG = "code.zip"
-SKINNY_MODEL_CODE_TAG = "skinny_code.zip"
-FROGML_SDK_VERSION_TAG = "frogml_sdk_version"
-FROGML_RUNTIME_WHEEL_TAG = "frogml_runtime_wheel"
-FROGML_CORE_WHEEL_TAG = "frogml_core_wheel"
-BUILD_CONFIG_TAG = "frogml_build_config"
-FROGML_BUILT_MODEL_TAG = "frogml_built_model"

frogml_core-0.0.114/frogml_storage/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.114"