frogml-cli 0.0.4__tar.gz → 0.0.6__tar.gz

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-cli
-Version: 0.0.4
+Version: 0.0.6
 Summary: Frogml CLI for frogml models
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model,jfrog
@@ -27,7 +27,7 @@ Requires-Dist: click (==8.1.8)
 Requires-Dist: cloudpickle (==2.2.1) ; extra == "feature-store"
 Requires-Dist: cookiecutter
 Requires-Dist: croniter (==1.4.1)
-Requires-Dist: frogml (>=1.1.96)
+Requires-Dist: frogml (>=1.1.115,<2)
 Requires-Dist: frogml-inference (>=0.0.2,<0.0.3)
 Requires-Dist: gitpython (>=2.1.0)
 Requires-Dist: joblib (>=1.1.0,<2.0.0) ; extra == "batch" or extra == "feedback"

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/__init__.py

@@ -1,6 +1,6 @@
 # fmt: off
 __author__ = '''JFrog Ltd.'''
-__version__ = '0.0.4'
+__version__ = '0.0.6'
 __name__ = 'frogml_cli'
 
 from frogml import wire_dependencies

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/alerts/alerts_commnad_group.py

@@ -7,7 +7,7 @@ from frogml_cli.commands.alerts.register.ui import register_channel
 
 @click.group(
     name="alerts",
-    help="Commands for interacting with the Qwak alerts System",
+    help="Commands for interacting with JFrogML alerts System",
 )
 def alerts_commands_group():
     pass

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/alerts/register/_logic.py

@@ -5,29 +5,34 @@ from typing import List
 from frogml.core.clients.alerts_registry import AlertingRegistryClient
 from frogml.core.clients.alerts_registry.channel import Channel
 
-from frogml_cli.inner.file_registry import extract_class_objects, list_qwak_python_files
+from frogml_cli.inner.file_registry import (
+    extract_class_objects,
+    list_frogml_python_files,
+)
 from frogml_cli.inner.tools.cli_tools import ask_yesno
 from frogml_cli.tools.utils import frogml_spinner
 
 FROGML_alerts_DELIMITER = "----------------------------------------"
 
 
-def _register_channels(qwak_python_files, alerts_client, force):
+def _register_channels(frogml_python_files, alerts_client, force):
     """
     Register Channels
 
     Args:
-        qwak_python_files: a list of python files containing qwak package imports
+        frogml_python_files: a list of python files containing frogml package imports
         alerts_client: AlertingRegistryClient alerts service client
         force: boolean determining if to force register all encountered Channel objects
     """
     with frogml_spinner(
         begin_text="Looking for channels to register", print_callback=print
     ):
-        qwak_channels: List[Channel] = extract_class_objects(qwak_python_files, Channel)
+        frogml_channels: List[Channel] = extract_class_objects(
+            frogml_python_files, Channel
+        )
 
-    print(f"👀 Found {len(qwak_channels)} Channels")
-    for channel, source_file_path in qwak_channels:
+    print(f"👀 Found {len(frogml_channels)} Channels")
+    for channel, source_file_path in frogml_channels:
         channel_id, existing_channel = alerts_client.get_alerting_channel(channel.name)
         if existing_channel:
             if ask_yesno(
@@ -53,20 +58,19 @@ def execute_register_channel(path: Path, force: bool):
         path = Path(path)
 
     if path.is_file():
-        qwak_python_files = [(str(path), os.path.abspath(path))]
+        frogml_python_files = [(str(path), os.path.abspath(path))]
     elif Path.is_dir(path):
         with frogml_spinner(
             begin_text="Recursively looking for python files in input dir",
             print_callback=print,
         ) as sp:
-            qwak_python_files = list_qwak_python_files(path, sp)
-            print(qwak_python_files)
+            frogml_python_files = list_frogml_python_files(path, sp)
+            print(frogml_python_files)
             print(sp)
-            pass
 
     alerts_client = AlertingRegistryClient()
     _register_channels(
-        qwak_python_files=qwak_python_files,
+        frogml_python_files=frogml_python_files,
         alerts_client=alerts_client,
         force=force,
     )

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/automations/automations_commands_group.py

@@ -17,7 +17,7 @@ AUTOMATION = "automation"
 
 @click.group(
     name="automations",
-    help="Commands for interacting with the Qwak Automations",
+    help="Commands for interacting with JFrogML Automations",
 )
 def automations_commands_group():
     # Click commands group injection

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/automations/register/_logic.py

@@ -10,23 +10,23 @@ from frogml_cli.tools.utils import frogml_spinner
 DELIMITER = "----------------------------------------"
 
 
-def register_automations(qwak_python_files: List[str], force: bool):
+def register_automations(frogml_python_files: List[str], force: bool):
     """
     Register Automation Entities Objects
 
     Args:
-        qwak_python_files: a list of python files containing qwak package imports
+        frogml_python_files: a list of python files containing frogml package imports
         force: to force
     """
     with frogml_spinner(
         begin_text="Finding Automations to register", print_callback=print
     ):
-        qwak_automations: List[Automation] = extract_class_objects(
-            qwak_python_files, Automation
+        frogml_automations: List[Automation] = extract_class_objects(
+            frogml_python_files, Automation
         )
     client = AutomationsManagementClient()
-    print(f"Found {len(qwak_automations)} Automations")
-    for automation, source_file_path in qwak_automations:
+    print(f"Found {len(frogml_automations)} Automations")
+    for automation, source_file_path in frogml_automations:
         existing_automation = client.get_automation_by_name(automation.name)
         if existing_automation:
             if ask_yesno(

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/automations/register/ui.py

@@ -4,7 +4,7 @@ from pathlib import Path
 import click
 
 from frogml_cli.commands.automations.register._logic import register_automations
-from frogml_cli.inner.file_registry import list_qwak_python_files
+from frogml_cli.inner.file_registry import list_frogml_python_files
 from frogml_cli.inner.tools.cli_tools import FrogMLCommand
 from frogml_cli.tools.utils import frogml_spinner
 
@@ -33,12 +33,12 @@ from frogml_cli.tools.utils import frogml_spinner
 def register(path: Path, force: bool, **kwargs):
     path = Path(path) if path else Path.cwd()
     if path.is_file():
-        qwak_python_files = [(str(path), os.path.abspath(path))]
+        frogml_python_files = [(str(path), os.path.abspath(path))]
     elif Path.is_dir(path):
         with frogml_spinner(
             begin_text="Recursively looking for python files in input dir",
             print_callback=print,
         ) as sp:
-            qwak_python_files = list_qwak_python_files(path, sp)
+            frogml_python_files = list_frogml_python_files(path, sp)
 
-    register_automations(qwak_python_files, force)
+    register_automations(frogml_python_files, force)

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/feature_store/feature_store_command_group.py

@@ -12,7 +12,7 @@ from frogml_cli.commands.feature_store.trigger.ui import trigger_feature_set
 
 @click.group(
     name="features",
-    help="Commands for interacting with the Qwak Feature Store",
+    help="Commands for interacting with JFrogML Feature Store",
 )
 def feature_store_commands_group():
     # Click commands group injection

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/feature_store/register/_logic.py

@@ -32,7 +32,7 @@ DELIMITER = "----------------------------------------"
 
 
 def _register_entities(
-    qwak_python_files: List[Tuple[str, str]],
+    frogml_python_files: List[Tuple[str, str]],
     registry: FeatureRegistryClient,
     force: bool,
 ):
@@ -40,19 +40,19 @@ def _register_entities(
     Register Feature Store Entity Objects
 
     Args:
-        qwak_python_files: a list of python files containing qwak package imports
+        frogml_python_files: a list of python files containing frogml package imports
         registry: FeatureRegistryClient
         force: boolean determining if to force register all encountered Entity objects
     """
     with frogml_spinner(
         begin_text="Finding Entities to register", print_callback=print
     ):
-        qwak_entities: List[Tuple[Entity, str]] = extract_class_objects(
-            qwak_python_files, Entity
+        frogml_entities: List[Tuple[Entity, str]] = extract_class_objects(
+            frogml_python_files, Entity
         )
 
-    print(f"👀 Found {len(qwak_entities)} Entities")
-    for entity, source_file_path in qwak_entities:
+    print(f"👀 Found {len(frogml_entities)} Entities")
+    for entity, source_file_path in frogml_entities:
         existing_entity = registry.get_entity_by_name(entity.name)
         if existing_entity:
             if ask_yesno(
@@ -73,7 +73,7 @@ def _register_entities(
 
 
 def _register_data_sources(
-    qwak_python_files: List[Tuple[str, str]],
+    frogml_python_files: List[Tuple[str, str]],
     registry: FeatureRegistryClient,
     force: bool,
     no_validation: bool,
@@ -83,7 +83,7 @@ def _register_data_sources(
     Register Feature Store Data Source Objects
 
     Args:
-        qwak_python_files: a list of python files containing qwak package imports
+        frogml_python_files: a list of python files containing frogml package imports
         registry: FeatureRegistryClient
         force: boolean determining if to force register all encountered Data Source objects
         no_validation: whether to validate entities
@@ -92,12 +92,12 @@ def _register_data_sources(
     with frogml_spinner(
         begin_text="Finding Data Sources to register", print_callback=print
     ):
-        qwak_sources: List[Tuple[BaseSource, str]] = extract_class_objects(
-            qwak_python_files, BaseSource
+        frogml_sources: List[Tuple[BaseSource, str]] = extract_class_objects(
+            frogml_python_files, BaseSource
         )
 
-    print(f"👀 Found {len(qwak_sources)} Data Sources")
-    for data_source, source_file_path in qwak_sources:
+    print(f"👀 Found {len(frogml_sources)} Data Sources")
+    for data_source, source_file_path in frogml_sources:
         validation_failed = False
         artifact_url: Optional[str] = None
 
@@ -166,7 +166,7 @@ def _handle_data_source_validation(
 
 
 def _register_features_sets(
-    qwak_python_files: List[Tuple[str, str]],
+    frogml_python_files: List[Tuple[str, str]],
     registry: FeatureRegistryClient,
     force: bool,
     git_commit: str,
@@ -178,7 +178,7 @@ def _register_features_sets(
     Register Feature Store Feature Set Objects
 
     Args:
-        qwak_python_files: a list of python files containing qwak package imports
+        frogml_python_files: a list of python files containing frogml package imports
         registry: FeatureRegistryClient
         force: boolean determining if to force register all encountered Feature Set objects
         git_commit: the git commit of the parent folder
@@ -188,11 +188,11 @@ def _register_features_sets(
     with frogml_spinner(
         begin_text="Finding Feature Sets to register", print_callback=print
     ):
-        qwak_feature_sets = extract_class_objects(qwak_python_files, BaseFeatureSet)
+        frogml_feature_sets = extract_class_objects(frogml_python_files, BaseFeatureSet)
 
-    print(f"👀 Found {len(qwak_feature_sets)} Feature Set(s)")
+    print(f"👀 Found {len(frogml_feature_sets)} Feature Set(s)")
 
-    for featureset, source_file_path in qwak_feature_sets:
+    for featureset, source_file_path in frogml_feature_sets:
         featureset = cast(BaseFeatureSet, featureset)
         existing_feature_set: ProtoGetFeatureSetByNameResponse = (
             registry.get_feature_set_by_name(featureset.name)

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/feature_store/register/ui.py

@@ -10,7 +10,7 @@ from frogml_cli.commands.feature_store.register._logic import (
     _register_entities,
     _register_features_sets,
 )
-from frogml_cli.inner.file_registry import list_qwak_python_files
+from frogml_cli.inner.file_registry import list_frogml_python_files
 from frogml_cli.inner.tools.cli_tools import FrogMLCommand
 from frogml_cli.tools.utils import frogml_spinner
 
@@ -65,7 +65,7 @@ def register_fs_objects(
     fs_validation_ds_limit: Optional[int],
     **kwargs,
 ):
-    qwak_python_files: List[Tuple[str, str]]
+    frogml_python_files: List[Tuple[str, str]]
 
     if not path:
         path = Path.cwd()
@@ -73,13 +73,13 @@ def register_fs_objects(
         path = Path(path)
 
     if path.is_file():
-        qwak_python_files = [(str(path), os.path.abspath(path))]
+        frogml_python_files = [(str(path), os.path.abspath(path))]
     elif Path.is_dir(path):
         with frogml_spinner(
             begin_text="Recursively looking for python files in input dir",
             print_callback=print,
         ) as sp:
-            qwak_python_files = list_qwak_python_files(path, sp)
+            frogml_python_files = list_frogml_python_files(path, sp)
 
     try:
         import git
@@ -90,10 +90,10 @@ def register_fs_objects(
         git_commit = None
 
     registry_client = FeatureRegistryClient()
-    _register_entities(qwak_python_files, registry_client, force)
+    _register_entities(frogml_python_files, registry_client, force)
 
     _register_data_sources(
-        qwak_python_files,
+        frogml_python_files,
         registry_client,
         force,
         no_validation,
@@ -101,7 +101,7 @@ def register_fs_objects(
     )
 
     _register_features_sets(
-        qwak_python_files,
+        frogml_python_files,
         registry_client,
         force,
         git_commit,

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/models/build/_logic/client_logs/cli_phase_run_handler.py

@@ -18,7 +18,7 @@ from .utils import zip_logs
 class CLIPhaseRunHandler(PhaseRunHandler):
     BUILD_IN_PROGRESS_FORMAT = "Build phase in progress: {}"
     BUILD_FINISHED_FORMAT = "Phase successfully finished: {} after {} seconds"
-    KEYBOARD_INTERRUPT_FORMAT = "\n{color}Stopping Qwak build (ctrl-c)"
+    KEYBOARD_INTERRUPT_FORMAT = "\n{color}Stopping JFrogML build (ctrl-c)"
     BUILD_FAILURE_FORMAT = "Build phase failed: {} after {} seconds"
     PIPELINE_ERROR = "\n{color}{ex}"
     SPINNER_FINISH = "✅"

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/models/build/_logic/client_logs/logger.py

@@ -10,7 +10,7 @@ from pathlib import Path
 from frogml.core.inner.build_config.build_config_v1 import BuildConfigV1
 from frogml.core.inner.build_logic.constants.host_resource import HOST_FROGML_HIDDEN_FOLDER
 
-from frogml_cli import __version__ as qwak_sdk_version
+from frogml_cli import __version__ as frogml_cli_version
 from frogml_cli.inner.tools.logger import setup_frogml_logger
 from frogml_cli.inner.tools.logger.logger import (
     BUILD_LOCAL_FILE_HANDLER_NAME,
@@ -84,5 +84,5 @@ def setup_logger(
 
 def log_system_information(destination: Path):
     (destination / "python_version").write_text(sys.version)
-    (destination / "qwak_sdk_version").write_text(qwak_sdk_version)
+    (destination / "frogml_cli_version").write_text(frogml_cli_version)
     (destination / "os_detail").write_text(platform.platform())

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/models/build/_logic/util/step_decorator.py

@@ -48,7 +48,7 @@ def build_failure_handler():
 
 def cleaning_up_after_build(step: Step):
     if os.getenv("QWAK_DEBUG") != "true":
-        step.build_logger.debug("Removing Qwak temp artifacts directory")
+        step.build_logger.debug("Removing FrogML temp artifacts directory")
         shutil.rmtree(step.context.host_temp_local_build_dir, ignore_errors=True)
 
 

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/models/deployments/deploy/_logic/local_deployment.py

@@ -170,7 +170,7 @@ def _docker_login(docker_client):
         )
 
     except Exception as e:
-        raise FrogmlException(f"Failed to login to Qwak's container registry: {e}")
+        raise FrogmlException(f"Failed to login to FrogML's container registry: {e}")
 
 
 def _get_aws_credentials():

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/models/executions/start/ui.py

@@ -82,6 +82,12 @@ logger = get_frogml_logger()
     required=False,
     help="The access secret secret name (should be created before by using `frogml secret`).",
 )
+@click.option(
+    "--session-token",
+    type=str,
+    required=False,
+    help="The session token secret name (should be created before by using `frogml secret`).",
+)
 @click.option(
     "--job-timeout",
     type=int,

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/commands/models/init/ui.py

@@ -30,7 +30,7 @@ MODELS_INIT_EXAMPLE_CHOICES: List[str] = get_models_init_example_choices()
     metavar="NAME",
     required=False,
     type=click.Choice(MODELS_INIT_EXAMPLE_CHOICES, case_sensitive=True),
-    help=f"Generate a fully functioning example of a Qwak based model. Options: {' / '.join(MODELS_INIT_EXAMPLE_CHOICES)}",
+    help=f"Generate a fully functioning example of a FrogML based model. Options: {' / '.join(MODELS_INIT_EXAMPLE_CHOICES)}",
 )
 @click.argument("uri", metavar="URI", required=True)
 def model_init(
@@ -61,5 +61,7 @@ def model_init(
     try:
         initialize_model_structure(uri, template, logger, **template_args)
     except Exception as e:
-        logger.error(f"Failed to initialize a Qwak model structure. Error reason:\n{e}")
+        logger.error(
+            f"Failed to initialize a FrogML model structure. Error reason:\n{e}"
+        )
         exit(1)

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/frogml_cli/inner/file_registry.py

@@ -8,7 +8,7 @@ from typing import List, Tuple
 from yaspin.core import Yaspin
 
 
-def list_qwak_python_files(path: Path, sp: Yaspin) -> List[Tuple[str, str]]:
+def list_frogml_python_files(path: Path, sp: Yaspin) -> List[Tuple[str, str]]:
     """
     Helper function which finds python files with qwak imports in a given module
 

{frogml_cli-0.0.4 → frogml_cli-0.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "frogml-cli"
-version = "0.0.4"
+version = "0.0.6"
 description = "Frogml CLI for frogml models"
 authors = ["JFrog Ltd. <contact@jfrog.com>"]
 readme = "README.md"
@@ -49,7 +49,7 @@ pyspark = {version = "3.4.2", optional = true} # feature-store dependencies
 click = "8.1.8"
 catboost = ">=1.1.11"
 frogml-inference = "^0.0.2"
-frogml = ">=1.1.96"
+frogml = ">=1.1.115,<2"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "7.2.1"